diff --git a/.travis.yml b/.travis.yml
index 9f15deffc28..6e003ff35db 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -68,15 +68,15 @@ env:
     - TEST_ARG="make test-dymola    PACKAGE=\"Buildings.Applications\""
     - TEST_ARG="make test-openmodelica PACKAGE=\"Buildings.Applications\""
     - TEST_ARG="make test-optimica  PACKAGE=\"Buildings.Applications\""
-    - TEST_ARG="make test-dymola    PACKAGE=\"Buildings.Experimental.DHC.{EnergyTransferStations,Loads,Networks,Plants}\""
-    - TEST_ARG="make test-openmodelica PACKAGE=\"Buildings.Experimental.DHC.{EnergyTransferStations,Loads,Networks,Plants}\""
-    - TEST_ARG="make test-optimica  PACKAGE=\"Buildings.Experimental.DHC.{EnergyTransferStations,Loads,Networks,Plants}\""
-    - TEST_ARG="make test-dymola    PACKAGE=\"Buildings.Experimental.DHC.Examples.Combined\""
-    - TEST_ARG="make test-openmodelica PACKAGE=\"Buildings.Experimental.DHC.Examples.Combined\" SINGLEPROC=\"true\""
-    - TEST_ARG="make test-optimica  PACKAGE=\"Buildings.Experimental.DHC.Examples.Combined\""
-    - TEST_ARG="make test-dymola    PACKAGE=\"Buildings.Experimental.DHC.Examples.{Cooling,Steam}\""
-    - TEST_ARG="make test-openmodelica PACKAGE=\"Buildings.Experimental.DHC.Examples.{Cooling,Steam}\""
-    - TEST_ARG="make test-optimica  PACKAGE=\"Buildings.Experimental.DHC.Examples.{Cooling,Steam}\""
+    - TEST_ARG="make test-dymola    PACKAGE=\"Buildings.DHC.{ETS,Loads,Networks,Plants}\""
+    - TEST_ARG="make test-openmodelica PACKAGE=\"Buildings.DHC.{ETS,Loads,Networks,Plants}\""
+    - TEST_ARG="make test-optimica  PACKAGE=\"Buildings.DHC.{ETS,Loads,Networks,Plants}\""
+    - TEST_ARG="make test-dymola    PACKAGE=\"Buildings.DHC.Examples.Combined\""
+    - TEST_ARG="make test-openmodelica PACKAGE=\"Buildings.DHC.Examples.Combined\" SINGLEPROC=\"true\""
+    - TEST_ARG="make test-optimica  PACKAGE=\"Buildings.DHC.Examples.Combined\""
+    - TEST_ARG="make test-dymola    PACKAGE=\"Buildings.DHC.Examples.{Cooling,Steam}\""
+    - TEST_ARG="make test-openmodelica PACKAGE=\"Buildings.DHC.Examples.{Cooling,Steam}\""
+    - TEST_ARG="make test-optimica  PACKAGE=\"Buildings.DHC.Examples.{Cooling,Steam}\""
     - TEST_ARG="make test-dymola    PACKAGE=\"Buildings.Fluid.{Actuators,BaseClasses,Boilers,Chillers,CHPs,Delays}\""
     - TEST_ARG="make test-openmodelica PACKAGE=\"Buildings.Fluid.{Actuators,BaseClasses,Boilers,Chillers,CHPs,Delays}\""
     - TEST_ARG="make test-optimica  PACKAGE=\"Buildings.Fluid.{Actuators,BaseClasses,Boilers,Chillers,CHPs,Delays}\""
@@ -165,7 +165,7 @@ install:
       export ENERGYPLUS_23_1_0=${ENERGYPLUS_23_1_0};
       pip3 install pandas==1.3.5;
     fi;
-  - if [[ "$TEST_ARG" == *EnergyPlus_9_6_0* ]] || [[ "$TEST_ARG" == *Buildings.Experimental.DHC.{EnergyTransferStations,Loads,Networks,Plants}* ]] || [[ "$TEST_ARG" == *spawn* ]]; then
+  - if [[ "$TEST_ARG" == *EnergyPlus_9_6_0* ]] || [[ "$TEST_ARG" == *Buildings.DHC.{ETS,Loads,Networks,Plants}* ]] || [[ "$TEST_ARG" == *spawn* ]]; then
       echo "Installing Spawn binaries";
       Buildings/Resources/src/ThermalZones/install.py --binaries-for-os-only;
     fi;
diff --git a/Buildings/Controls/OBC/ASHRAE/G36/AHUs/MultiZone/VAV/SetPoints/FreezeProtection.mo b/Buildings/Controls/OBC/ASHRAE/G36/AHUs/MultiZone/VAV/SetPoints/FreezeProtection.mo
index 98c08e48927..626b1578f61 100644
--- a/Buildings/Controls/OBC/ASHRAE/G36/AHUs/MultiZone/VAV/SetPoints/FreezeProtection.mo
+++ b/Buildings/Controls/OBC/ASHRAE/G36/AHUs/MultiZone/VAV/SetPoints/FreezeProtection.mo
@@ -1129,7 +1129,7 @@ annotation (defaultComponentName="mulAHUFrePro",
         Text(
           extent={{-96,120},{-20,102}},
           textColor={0,0,127},
-          visible=minOADes == Buildings.Controls.OBC.ASHRAE.G36.Types.OutdoorSection.DedicatedDampersAirflow,
+          visible=minOADes == Buildings.Controls.OBC.ASHRAE.G36.Types.OutdoorAirSection.DedicatedDampersAirflow,
           textString="uMinOutDam"),
         Text(
           extent={{-98,78},{-46,62}},
@@ -1178,7 +1178,7 @@ annotation (defaultComponentName="mulAHUFrePro",
         Text(
           extent={{20,122},{98,104}},
           textColor={0,0,127},
-          visible=minOADes == Buildings.Controls.OBC.ASHRAE.G36.Types.OutdoorSection.DedicatedDampersAirflow,
+          visible=minOADes == Buildings.Controls.OBC.ASHRAE.G36.Types.OutdoorAirSection.DedicatedDampersAirflow,
           textString="yMinOutDam"),
         Text(
           extent={{50,50},{96,34}},
@@ -1237,11 +1237,11 @@ annotation (defaultComponentName="mulAHUFrePro",
           extent={{-96,104},{-14,80}},
           textColor={255,0,255},
           textString="u1MinOutDamPos",
-          visible=minOADes == Buildings.Controls.OBC.ASHRAE.G36.Types.OutdoorSection.DedicatedDampersPressure),
+          visible=minOADes == Buildings.Controls.OBC.ASHRAE.G36.Types.OutdoorAirSection.DedicatedDampersPressure),
         Text(
           extent={{16,102},{96,82}},
           textColor={255,0,255},
-          visible=minOADes == Buildings.Controls.OBC.ASHRAE.G36.Types.OutdoorSection.DedicatedDampersPressure,
+          visible=minOADes == Buildings.Controls.OBC.ASHRAE.G36.Types.OutdoorAirSection.DedicatedDampersPressure,
           textString="y1MinOutDam"),
         Text(
           extent={{-96,-16},{-46,-40}},
@@ -1354,6 +1354,10 @@ shall be no software reset switch.)
 </html>", revisions="<html>
 <ul>
 <li>
+April 6, 2024, by Michael Wetter:<br/>
+Corrected wrong annotation.
+</li>
+<li>
 September 18, 2023, by Jianjun Hu:<br/>
 Added 2-position relief damper position output.<br/>
 This is for
diff --git a/Buildings/Controls/OBC/ASHRAE/G36/AHUs/MultiZone/VAV/SetPoints/OutdoorAirFlow/ASHRAE62_1/AHU.mo b/Buildings/Controls/OBC/ASHRAE/G36/AHUs/MultiZone/VAV/SetPoints/OutdoorAirFlow/ASHRAE62_1/AHU.mo
index 827f76740fc..63703dcb167 100644
--- a/Buildings/Controls/OBC/ASHRAE/G36/AHUs/MultiZone/VAV/SetPoints/OutdoorAirFlow/ASHRAE62_1/AHU.mo
+++ b/Buildings/Controls/OBC/ASHRAE/G36/AHUs/MultiZone/VAV/SetPoints/OutdoorAirFlow/ASHRAE62_1/AHU.mo
@@ -219,15 +219,15 @@ annotation (
         Text(
           extent={{-96,-72},{-50,-88}},
           textColor={0,0,0},
-          visible=(minOADes == Buildings.Controls.OBC.ASHRAE.G36.Types.OutdoorSection.DedicatedDampersAirflow
-               or minOADes == Buildings.Controls.OBC.ASHRAE.G36.Types.OutdoorSection.SingleDamper),
+          visible=(minOADes == Buildings.Controls.OBC.ASHRAE.G36.Types.OutdoorAirSection.DedicatedDampersAirflow
+               or minOADes == Buildings.Controls.OBC.ASHRAE.G36.Types.OutdoorAirSection.SingleDamper),
           textString="VAirOut_flow"),
         Text(
           extent={{30,-70},{98,-86}},
           textColor={0,0,0},
           textString="outAir_normalized",
-          visible=(minOADes == Buildings.Controls.OBC.ASHRAE.G36.Types.OutdoorSection.DedicatedDampersAirflow
-               or minOADes == Buildings.Controls.OBC.ASHRAE.G36.Types.OutdoorSection.SingleDamper))}),
+          visible=(minOADes == Buildings.Controls.OBC.ASHRAE.G36.Types.OutdoorAirSection.DedicatedDampersAirflow
+               or minOADes == Buildings.Controls.OBC.ASHRAE.G36.Types.OutdoorAirSection.SingleDamper))}),
 Diagram(coordinateSystem(preserveAspectRatio=false, extent={{-220,-120},{220,120}})),
 Documentation(info="<html>
 <p>
@@ -298,6 +298,10 @@ but no larger than the design total outdoor airflow rate <code>VDesTotOutAir_flo
 </html>", revisions="<html>
 <ul>
 <li>
+April 6, 2024, by Michael Wetter:<br/>
+Corrected wrong annotation.
+</li>
+<li>
 March 12, 2022, by Jianjun Hu:<br/>
 First implementation.
 </li>
diff --git a/Buildings/Controls/OBC/ASHRAE/G36/AHUs/MultiZone/VAV/SetPoints/OutdoorAirFlow/Title24/AHU.mo b/Buildings/Controls/OBC/ASHRAE/G36/AHUs/MultiZone/VAV/SetPoints/OutdoorAirFlow/Title24/AHU.mo
index 8cfc690db7e..ef88eefa1ff 100644
--- a/Buildings/Controls/OBC/ASHRAE/G36/AHUs/MultiZone/VAV/SetPoints/OutdoorAirFlow/Title24/AHU.mo
+++ b/Buildings/Controls/OBC/ASHRAE/G36/AHUs/MultiZone/VAV/SetPoints/OutdoorAirFlow/Title24/AHU.mo
@@ -240,13 +240,13 @@ annotation (
           extent={{30,-76},{96,-100}},
           textColor={0,0,0},
           textString="outAir_normalized",
-          visible=(minOADes == Buildings.Controls.OBC.ASHRAE.G36.Types.OutdoorSection.DedicatedDampersAirflow
-               or minOADes == Buildings.Controls.OBC.ASHRAE.G36.Types.OutdoorSection.SingleDamper)),
+          visible=(minOADes == Buildings.Controls.OBC.ASHRAE.G36.Types.OutdoorAirSection.DedicatedDampersAirflow
+               or minOADes == Buildings.Controls.OBC.ASHRAE.G36.Types.OutdoorAirSection.SingleDamper)),
         Text(
           extent={{-98,-74},{-54,-88}},
           textColor={0,0,0},
-          visible=(minOADes == Buildings.Controls.OBC.ASHRAE.G36.Types.OutdoorSection.DedicatedDampersAirflow
-               or minOADes == Buildings.Controls.OBC.ASHRAE.G36.Types.OutdoorSection.SingleDamper),
+          visible=(minOADes == Buildings.Controls.OBC.ASHRAE.G36.Types.OutdoorAirSection.DedicatedDampersAirflow
+               or minOADes == Buildings.Controls.OBC.ASHRAE.G36.Types.OutdoorAirSection.SingleDamper),
           textString="VAirOut_flow")}),
 Diagram(coordinateSystem(preserveAspectRatio=false, extent={{-100,-200},{100,200}})),
 Documentation(info="<html>
@@ -299,6 +299,10 @@ outdoor airflow setpoint should be equal to the <code>VEffDesOutAir_flow</code>.
 </html>", revisions="<html>
 <ul>
 <li>
+April 6, 2024, by Michael Wetter:<br/>
+Corrected wrong annotation.
+</li>
+<li>
 March 12, 2022, by Jianjun Hu:<br/>
 First implementation.
 </li>
diff --git a/Buildings/Experimental/DHC/BaseClasses/Steam/PartialSaturatedControlVolume.mo b/Buildings/DHC/BaseClasses/Steam/PartialSaturatedControlVolume.mo
similarity index 95%
rename from Buildings/Experimental/DHC/BaseClasses/Steam/PartialSaturatedControlVolume.mo
rename to Buildings/DHC/BaseClasses/Steam/PartialSaturatedControlVolume.mo
index ead9da25671..f5d261dad68 100644
--- a/Buildings/Experimental/DHC/BaseClasses/Steam/PartialSaturatedControlVolume.mo
+++ b/Buildings/DHC/BaseClasses/Steam/PartialSaturatedControlVolume.mo
@@ -1,8 +1,8 @@
-within Buildings.Experimental.DHC.BaseClasses.Steam;
+within Buildings.DHC.BaseClasses.Steam;
 partial model PartialSaturatedControlVolume
   "Partial control volume for evaporation/condensation processes"
   extends Buildings.BaseClasses.BaseIcon;
-  extends Buildings.Experimental.DHC.BaseClasses.Steam.PartialTwoPortTwoMedium(
+  extends Buildings.DHC.BaseClasses.Steam.PartialTwoPortTwoMedium(
     p_start=MediumSte.p_default,
     final T_start=MediumSte.saturationTemperature(p_start));
 
@@ -285,10 +285,10 @@ liquid or saturated vapor.
 </ul>
 <p>
 Models that extend this base class include
-<a href = \"modelica://Buildings.Experimental.DHC.Plants.Steam.BaseClasses.ControlVolumeEvaporation\">
-Buildings.Experimental.DHC.Plants.Steam.BaseClasses.ControlVolumeEvaporation</a> and
-<a href = \"modelica://Buildings.Experimental.DHC.Loads.Steam.BaseClasses.ControlVolumeCondensation\">
-Buildings.Experimental.DHC.Loads.Steam.BaseClasses.ControlVolumeCondensation</a>.
+<a href = \"modelica://Buildings.DHC.Plants.Steam.BaseClasses.ControlVolumeEvaporation\">
+Buildings.DHC.Plants.Steam.BaseClasses.ControlVolumeEvaporation</a> and
+<a href = \"modelica://Buildings.DHC.Loads.Steam.BaseClasses.ControlVolumeCondensation\">
+Buildings.DHC.Loads.Steam.BaseClasses.ControlVolumeCondensation</a>.
 </p>
 
 <h4>Reference</h4>
diff --git a/Buildings/Experimental/DHC/BaseClasses/Steam/PartialTwoPortTwoMedium.mo b/Buildings/DHC/BaseClasses/Steam/PartialTwoPortTwoMedium.mo
similarity index 99%
rename from Buildings/Experimental/DHC/BaseClasses/Steam/PartialTwoPortTwoMedium.mo
rename to Buildings/DHC/BaseClasses/Steam/PartialTwoPortTwoMedium.mo
index 78626e29652..dfdf54e0ff1 100644
--- a/Buildings/Experimental/DHC/BaseClasses/Steam/PartialTwoPortTwoMedium.mo
+++ b/Buildings/DHC/BaseClasses/Steam/PartialTwoPortTwoMedium.mo
@@ -1,4 +1,4 @@
-within Buildings.Experimental.DHC.BaseClasses.Steam;
+within Buildings.DHC.BaseClasses.Steam;
 partial model PartialTwoPortTwoMedium
   "Partial model with two ports with two separate medium models without storing mass or energy"
 
diff --git a/Buildings/Experimental/DHC/BaseClasses/Steam/package.mo b/Buildings/DHC/BaseClasses/Steam/package.mo
similarity index 91%
rename from Buildings/Experimental/DHC/BaseClasses/Steam/package.mo
rename to Buildings/DHC/BaseClasses/Steam/package.mo
index 043550def05..3468baf6b61 100644
--- a/Buildings/Experimental/DHC/BaseClasses/Steam/package.mo
+++ b/Buildings/DHC/BaseClasses/Steam/package.mo
@@ -1,4 +1,4 @@
-within Buildings.Experimental.DHC.BaseClasses;
+within Buildings.DHC.BaseClasses;
 package Steam "Package for steam systems using the split-medium approach."
   extends Modelica.Icons.VariantsPackage;
 
diff --git a/Buildings/Experimental/DHC/BaseClasses/Steam/package.order b/Buildings/DHC/BaseClasses/Steam/package.order
similarity index 100%
rename from Buildings/Experimental/DHC/BaseClasses/Steam/package.order
rename to Buildings/DHC/BaseClasses/Steam/package.order
diff --git a/Buildings/Experimental/DHC/BaseClasses/package.mo b/Buildings/DHC/BaseClasses/package.mo
similarity index 52%
rename from Buildings/Experimental/DHC/BaseClasses/package.mo
rename to Buildings/DHC/BaseClasses/package.mo
index 59543af4a4d..ef8d84f29b9 100644
--- a/Buildings/Experimental/DHC/BaseClasses/package.mo
+++ b/Buildings/DHC/BaseClasses/package.mo
@@ -1,11 +1,11 @@
-within Buildings.Experimental.DHC;
-package BaseClasses "Package with base classes for Buildings.Experimental.DHC"
+within Buildings.DHC;
+package BaseClasses "Package with base classes for Buildings.DHC"
   extends Modelica.Icons.BasesPackage;
 annotation (preferredView="info", Documentation(info="<html>
 <p>
 This package contains base classes that are used to construct the models in
-<a href=\"modelica://Buildings.Experimental.DHC\">
-Buildings.Experimental.DHC</a>.
+<a href=\"modelica://Buildings.DHC\">
+Buildings.DHC</a>.
 </p>
 </html>"));
 end BaseClasses;
diff --git a/Buildings/Experimental/DHC/BaseClasses/package.order b/Buildings/DHC/BaseClasses/package.order
similarity index 100%
rename from Buildings/Experimental/DHC/BaseClasses/package.order
rename to Buildings/DHC/BaseClasses/package.order
diff --git a/Buildings/Experimental/DHC/EnergyTransferStations/BaseClasses/CollectorDistributor.mo b/Buildings/DHC/ETS/BaseClasses/CollectorDistributor.mo
similarity index 90%
rename from Buildings/Experimental/DHC/EnergyTransferStations/BaseClasses/CollectorDistributor.mo
rename to Buildings/DHC/ETS/BaseClasses/CollectorDistributor.mo
index 32fa5ef0de0..06001e53a2f 100644
--- a/Buildings/Experimental/DHC/EnergyTransferStations/BaseClasses/CollectorDistributor.mo
+++ b/Buildings/DHC/ETS/BaseClasses/CollectorDistributor.mo
@@ -1,7 +1,7 @@
-within Buildings.Experimental.DHC.EnergyTransferStations.BaseClasses;
+within Buildings.DHC.ETS.BaseClasses;
 model CollectorDistributor
   "Model of a collector/distributor with zero pressure drop between connections"
-  extends Buildings.Experimental.DHC.Networks.BaseClasses.PartialDistribution2Pipe(
+  extends Buildings.DHC.Networks.BaseClasses.PartialDistribution2Pipe(
     mDis_flow_nominal=sum(
       mCon_flow_nominal),
     final mDisCon_flow_nominal=fill(
diff --git a/Buildings/Experimental/DHC/EnergyTransferStations/BaseClasses/Connection2PipeLossless.mo b/Buildings/DHC/ETS/BaseClasses/Connection2PipeLossless.mo
similarity index 82%
rename from Buildings/Experimental/DHC/EnergyTransferStations/BaseClasses/Connection2PipeLossless.mo
rename to Buildings/DHC/ETS/BaseClasses/Connection2PipeLossless.mo
index def989054f5..546a83cde97 100644
--- a/Buildings/Experimental/DHC/EnergyTransferStations/BaseClasses/Connection2PipeLossless.mo
+++ b/Buildings/DHC/ETS/BaseClasses/Connection2PipeLossless.mo
@@ -1,7 +1,7 @@
-within Buildings.Experimental.DHC.EnergyTransferStations.BaseClasses;
+within Buildings.DHC.ETS.BaseClasses;
 model Connection2PipeLossless
   "Model of a lossless connection to a collector/distributor"
-  extends Buildings.Experimental.DHC.Networks.BaseClasses.PartialConnection2Pipe(
+  extends Buildings.DHC.Networks.BaseClasses.PartialConnection2Pipe(
     redeclare model Model_pipDisSup =
         Buildings.Fluid.FixedResistances.LosslessPipe,
     redeclare model Model_pipDisRet =
diff --git a/Buildings/Experimental/DHC/EnergyTransferStations/BaseClasses/Junction.mo b/Buildings/DHC/ETS/BaseClasses/Junction.mo
similarity index 89%
rename from Buildings/Experimental/DHC/EnergyTransferStations/BaseClasses/Junction.mo
rename to Buildings/DHC/ETS/BaseClasses/Junction.mo
index 3e1e3daa631..fb153384a95 100644
--- a/Buildings/Experimental/DHC/EnergyTransferStations/BaseClasses/Junction.mo
+++ b/Buildings/DHC/ETS/BaseClasses/Junction.mo
@@ -1,4 +1,4 @@
-within Buildings.Experimental.DHC.EnergyTransferStations.BaseClasses;
+within Buildings.DHC.ETS.BaseClasses;
 model Junction
   "Fluid junction with zero pressure drop"
   extends Fluid.FixedResistances.Junction(
diff --git a/Buildings/Experimental/DHC/EnergyTransferStations/BaseClasses/PartialDirect.mo b/Buildings/DHC/ETS/BaseClasses/PartialDirect.mo
similarity index 97%
rename from Buildings/Experimental/DHC/EnergyTransferStations/BaseClasses/PartialDirect.mo
rename to Buildings/DHC/ETS/BaseClasses/PartialDirect.mo
index 5ef2c97f5a0..18e662568d5 100644
--- a/Buildings/Experimental/DHC/EnergyTransferStations/BaseClasses/PartialDirect.mo
+++ b/Buildings/DHC/ETS/BaseClasses/PartialDirect.mo
@@ -1,8 +1,8 @@
-within Buildings.Experimental.DHC.EnergyTransferStations.BaseClasses;
+within Buildings.DHC.ETS.BaseClasses;
 model PartialDirect
   "Partial direct ETS model for district energy systems with in-building pumping and deltaT control"
   extends
-    Buildings.Experimental.DHC.EnergyTransferStations.BaseClasses.PartialETS(
+    Buildings.DHC.ETS.BaseClasses.PartialETS(
     final have_weaBus=false,
     final have_hotWat=false,
     final have_eleHea=false,
@@ -218,7 +218,7 @@ cooling network is at or above the minimum specified value. This configuration
 naturally results in a fluctuating building supply tempearture.
 </p>
 <p align=\"center\">
-<img src=\"modelica://Buildings/Resources/Images/Experimental/DHC/EnergyTransferStations/Cooling/Direct.png\" alt=\"DC ETS Direct\"/>
+<img src=\"modelica://Buildings/Resources/Images/DHC/ETS/Cooling/Direct.png\" alt=\"DC ETS Direct\"/>
 </p>
 <h4>
 Reference
diff --git a/Buildings/Experimental/DHC/EnergyTransferStations/BaseClasses/PartialETS.mo b/Buildings/DHC/ETS/BaseClasses/PartialETS.mo
similarity index 83%
rename from Buildings/Experimental/DHC/EnergyTransferStations/BaseClasses/PartialETS.mo
rename to Buildings/DHC/ETS/BaseClasses/PartialETS.mo
index 31cb0b9a4c6..7add4da4181 100644
--- a/Buildings/Experimental/DHC/EnergyTransferStations/BaseClasses/PartialETS.mo
+++ b/Buildings/DHC/ETS/BaseClasses/PartialETS.mo
@@ -1,7 +1,7 @@
-within Buildings.Experimental.DHC.EnergyTransferStations.BaseClasses;
+within Buildings.DHC.ETS.BaseClasses;
 partial model PartialETS
   "Partial class for modeling an energy transfer station"
-  import TypDisSys=Buildings.Experimental.DHC.Types.DistrictSystemType
+  import TypDisSys=Buildings.DHC.Types.DistrictSystemType
     "District system type enumeration";
   replaceable package MediumSer=Buildings.Media.Water
     constrainedby Modelica.Media.Interfaces.PartialMedium
@@ -10,12 +10,12 @@ partial model PartialETS
     constrainedby Modelica.Media.Interfaces.PartialMedium
     "Service side medium at heating inlet"
     annotation(Dialog(enable=
-      typ == Buildings.Experimental.DHC.Types.DistrictSystemType.CombinedGeneration1 or
-      typ == Buildings.Experimental.DHC.Types.DistrictSystemType.HeatingGeneration1));
+      typ == Buildings.DHC.Types.DistrictSystemType.CombinedGeneration1 or
+      typ == Buildings.DHC.Types.DistrictSystemType.HeatingGeneration1));
   replaceable package MediumBui=Buildings.Media.Water
     constrainedby Modelica.Media.Interfaces.PartialMedium
     "Building side medium";
-  parameter TypDisSys typ = Buildings.Experimental.DHC.Types.DistrictSystemType.CombinedGeneration2to4
+  parameter TypDisSys typ = Buildings.DHC.Types.DistrictSystemType.CombinedGeneration2to4
     "Type of district system"
     annotation (Evaluate=true, Dialog(group="Configuration"));
   parameter Integer nPorts_aHeaWat=0
@@ -136,7 +136,7 @@ partial model PartialETS
     redeclare package Medium = MediumSer,
     m_flow(min=if allowFlowReversalSer then -Modelica.Constants.inf else 0),
     h_outflow(start=MediumSer.h_default, nominal=MediumSer.h_default))
- if typ == Buildings.Experimental.DHC.Types.DistrictSystemType.CombinedGeneration5
+ if typ == Buildings.DHC.Types.DistrictSystemType.CombinedGeneration5
     "Fluid connector for ambient water service supply line"
     annotation (
       Placement(transformation(extent={{-310,-210},{-290,-190}}),
@@ -145,7 +145,7 @@ partial model PartialETS
     redeclare package Medium = MediumSer,
     m_flow(max=if allowFlowReversalSer then +Modelica.Constants.inf else 0),
     h_outflow(start=MediumSer.h_default, nominal=MediumSer.h_default))
- if typ == Buildings.Experimental.DHC.Types.DistrictSystemType.CombinedGeneration5
+ if typ == Buildings.DHC.Types.DistrictSystemType.CombinedGeneration5
     "Fluid connector for ambient water service return line"
     annotation (
       Placement(transformation(extent={{290,-210},{310,-190}}),
@@ -154,8 +154,8 @@ partial model PartialETS
     redeclare package Medium = MediumSerHea_a,
     m_flow(min=if allowFlowReversalSer then -Modelica.Constants.inf else 0),
     h_outflow(start=MediumSerHea_a.h_default, nominal=MediumSerHea_a.h_default))
- if typ <> Buildings.Experimental.DHC.Types.DistrictSystemType.Cooling and
-    typ <> Buildings.Experimental.DHC.Types.DistrictSystemType.CombinedGeneration5
+ if typ <> Buildings.DHC.Types.DistrictSystemType.Cooling and
+    typ <> Buildings.DHC.Types.DistrictSystemType.CombinedGeneration5
     "Fluid connector for heating service supply line"
     annotation (Placement(
       transformation(extent={{-310,-250},{-290,-230}}), iconTransformation(
@@ -164,8 +164,8 @@ partial model PartialETS
     redeclare package Medium = MediumSer,
     m_flow(max=if allowFlowReversalSer then +Modelica.Constants.inf else 0),
     h_outflow(start=MediumSer.h_default, nominal=MediumSer.h_default))
- if typ <> Buildings.Experimental.DHC.Types.DistrictSystemType.Cooling and
-    typ <> Buildings.Experimental.DHC.Types.DistrictSystemType.CombinedGeneration5
+ if typ <> Buildings.DHC.Types.DistrictSystemType.Cooling and
+    typ <> Buildings.DHC.Types.DistrictSystemType.CombinedGeneration5
     "Fluid connector for heating service return line"
     annotation (Placement(
         transformation(extent={{290,-250},{310,-230}}), iconTransformation(
@@ -174,18 +174,18 @@ partial model PartialETS
     redeclare package Medium = MediumSer,
     m_flow(min=if allowFlowReversalSer then -Modelica.Constants.inf else 0),
     h_outflow(start=MediumSer.h_default, nominal=MediumSer.h_default))
- if typ == Buildings.Experimental.DHC.Types.DistrictSystemType.CombinedGeneration1 or
-    typ == Buildings.Experimental.DHC.Types.DistrictSystemType.CombinedGeneration2to4 or
-    typ == Buildings.Experimental.DHC.Types.DistrictSystemType.Cooling
+ if typ == Buildings.DHC.Types.DistrictSystemType.CombinedGeneration1 or
+    typ == Buildings.DHC.Types.DistrictSystemType.CombinedGeneration2to4 or
+    typ == Buildings.DHC.Types.DistrictSystemType.Cooling
     "Fluid connector for cooling service supply line"
     annotation (Placement(transformation(extent={{-310,-290},{-290,-270}})));
   Modelica.Fluid.Interfaces.FluidPort_b port_bSerCoo(
     redeclare package Medium = MediumSer,
     m_flow(max=if allowFlowReversalSer then +Modelica.Constants.inf else 0),
     h_outflow(start=MediumSer.h_default, nominal=MediumSer.h_default))
- if typ == Buildings.Experimental.DHC.Types.DistrictSystemType.CombinedGeneration1 or
-    typ == Buildings.Experimental.DHC.Types.DistrictSystemType.CombinedGeneration2to4 or
-    typ == Buildings.Experimental.DHC.Types.DistrictSystemType.Cooling
+ if typ == Buildings.DHC.Types.DistrictSystemType.CombinedGeneration1 or
+    typ == Buildings.DHC.Types.DistrictSystemType.CombinedGeneration2to4 or
+    typ == Buildings.DHC.Types.DistrictSystemType.Cooling
     "Fluid connector for cooling service return line"
     annotation (Placement(
       transformation(extent={{290,-290},{310,-270}}), iconTransformation(
@@ -264,8 +264,8 @@ and optional in-building primary systems.
 The connectors to the service lines are configured based on an enumeration
 defining the type of district system (<code>CombinedGeneration2to4</code>
 by default), see
-<a href=\"modelica://Buildings.Experimental.DHC.Types.DistrictSystemType\">
-Buildings.Experimental.DHC.Types.DistrictSystemType</a>.
+<a href=\"modelica://Buildings.DHC.Types.DistrictSystemType\">
+Buildings.DHC.Types.DistrictSystemType</a>.
 In case of a heating service line, the model allows for using two
 different media at the inlet port <code>port_aSerHea</code> and at the oulet
 port <code>port_bSerHea</code> to represent a steam supply and condensate
@@ -322,36 +322,36 @@ First implementation.
           pattern=LinePattern.None,
           fillColor={255,0,0},
           fillPattern=FillPattern.Solid,
-          visible=typ <> Buildings.Experimental.DHC.Types.DistrictSystemType.Cooling and typ <> Buildings.Experimental.DHC.Types.DistrictSystemType.CombinedGeneration5),
+          visible=typ <> Buildings.DHC.Types.DistrictSystemType.Cooling and typ <> Buildings.DHC.Types.DistrictSystemType.CombinedGeneration5),
         Rectangle(
           extent={{20,-288},{300,-272}},
           lineColor={0,0,255},
           pattern=LinePattern.None,
           fillColor={0,0,255},
           fillPattern=FillPattern.Solid,
-          visible=typ == Buildings.Experimental.DHC.Types.DistrictSystemType.CombinedGeneration1 or typ == Buildings.Experimental.DHC.Types.DistrictSystemType.CombinedGeneration2to4
-               or typ == Buildings.Experimental.DHC.Types.DistrictSystemType.Cooling),
+          visible=typ == Buildings.DHC.Types.DistrictSystemType.CombinedGeneration1 or typ == Buildings.DHC.Types.DistrictSystemType.CombinedGeneration2to4
+               or typ == Buildings.DHC.Types.DistrictSystemType.Cooling),
         Rectangle(
           extent={{-300,-208},{-100,-192}},
           lineColor={0,0,255},
           pattern=LinePattern.None,
           fillColor={0,255,255},
           fillPattern=FillPattern.Solid,
-          visible=typ == Buildings.Experimental.DHC.Types.DistrictSystemType.CombinedGeneration5),
+          visible=typ == Buildings.DHC.Types.DistrictSystemType.CombinedGeneration5),
         Rectangle(
           extent={{100,-208},{300,-192}},
           lineColor={0,0,255},
           pattern=LinePattern.None,
           fillColor={0,255,255},
           fillPattern=FillPattern.Solid,
-          visible=typ == Buildings.Experimental.DHC.Types.DistrictSystemType.CombinedGeneration5),
+          visible=typ == Buildings.DHC.Types.DistrictSystemType.CombinedGeneration5),
         Rectangle(
           extent={{-25,-8},{25,8}},
           lineColor={0,0,255},
           pattern=LinePattern.None,
           fillColor={0,255,255},
           fillPattern=FillPattern.Solid,
-          visible=typ == Buildings.Experimental.DHC.Types.DistrictSystemType.CombinedGeneration5,
+          visible=typ == Buildings.DHC.Types.DistrictSystemType.CombinedGeneration5,
           origin={108,-167},
           rotation=90),
         Rectangle(
@@ -360,7 +360,7 @@ First implementation.
           pattern=LinePattern.None,
           fillColor={0,255,255},
           fillPattern=FillPattern.Solid,
-          visible=typ == Buildings.Experimental.DHC.Types.DistrictSystemType.CombinedGeneration5,
+          visible=typ == Buildings.DHC.Types.DistrictSystemType.CombinedGeneration5,
           origin={-108,-167},
           rotation=90),
         Rectangle(
@@ -369,14 +369,14 @@ First implementation.
           pattern=LinePattern.None,
           fillColor={255,0,0},
           fillPattern=FillPattern.Solid,
-          visible=typ <> Buildings.Experimental.DHC.Types.DistrictSystemType.Cooling and typ <> Buildings.Experimental.DHC.Types.DistrictSystemType.CombinedGeneration5),
+          visible=typ <> Buildings.DHC.Types.DistrictSystemType.Cooling and typ <> Buildings.DHC.Types.DistrictSystemType.CombinedGeneration5),
         Rectangle(
           extent={{-45,-8},{45,8}},
           lineColor={0,0,255},
           pattern=LinePattern.None,
           fillColor={255,0,0},
           fillPattern=FillPattern.Solid,
-          visible=typ <> Buildings.Experimental.DHC.Types.DistrictSystemType.Cooling and typ <> Buildings.Experimental.DHC.Types.DistrictSystemType.CombinedGeneration5,
+          visible=typ <> Buildings.DHC.Types.DistrictSystemType.Cooling and typ <> Buildings.DHC.Types.DistrictSystemType.CombinedGeneration5,
           origin={66,-187},
           rotation=90),
         Rectangle(
@@ -385,7 +385,7 @@ First implementation.
           pattern=LinePattern.None,
           fillColor={255,0,0},
           fillPattern=FillPattern.Solid,
-          visible=typ <> Buildings.Experimental.DHC.Types.DistrictSystemType.Cooling and typ <> Buildings.Experimental.DHC.Types.DistrictSystemType.CombinedGeneration5,
+          visible=typ <> Buildings.DHC.Types.DistrictSystemType.Cooling and typ <> Buildings.DHC.Types.DistrictSystemType.CombinedGeneration5,
           origin={-66,-187},
           rotation=90),
         Rectangle(
@@ -394,8 +394,8 @@ First implementation.
           pattern=LinePattern.None,
           fillColor={0,0,255},
           fillPattern=FillPattern.Solid,
-          visible=typ == Buildings.Experimental.DHC.Types.DistrictSystemType.CombinedGeneration1 or typ == Buildings.Experimental.DHC.Types.DistrictSystemType.CombinedGeneration2to4
-               or typ == Buildings.Experimental.DHC.Types.DistrictSystemType.Cooling,
+          visible=typ == Buildings.DHC.Types.DistrictSystemType.CombinedGeneration1 or typ == Buildings.DHC.Types.DistrictSystemType.CombinedGeneration2to4
+               or typ == Buildings.DHC.Types.DistrictSystemType.Cooling,
           origin={28,-207},
           rotation=90),
         Rectangle(
@@ -404,16 +404,16 @@ First implementation.
           pattern=LinePattern.None,
           fillColor={0,0,255},
           fillPattern=FillPattern.Solid,
-          visible=typ == Buildings.Experimental.DHC.Types.DistrictSystemType.CombinedGeneration1 or typ == Buildings.Experimental.DHC.Types.DistrictSystemType.CombinedGeneration2to4
-               or typ == Buildings.Experimental.DHC.Types.DistrictSystemType.Cooling),
+          visible=typ == Buildings.DHC.Types.DistrictSystemType.CombinedGeneration1 or typ == Buildings.DHC.Types.DistrictSystemType.CombinedGeneration2to4
+               or typ == Buildings.DHC.Types.DistrictSystemType.Cooling),
         Rectangle(
           extent={{-65,-8},{65,8}},
           lineColor={0,0,255},
           pattern=LinePattern.None,
           fillColor={0,0,255},
           fillPattern=FillPattern.Solid,
-          visible=typ == Buildings.Experimental.DHC.Types.DistrictSystemType.CombinedGeneration1 or typ == Buildings.Experimental.DHC.Types.DistrictSystemType.CombinedGeneration2to4
-               or typ == Buildings.Experimental.DHC.Types.DistrictSystemType.Cooling,
+          visible=typ == Buildings.DHC.Types.DistrictSystemType.CombinedGeneration1 or typ == Buildings.DHC.Types.DistrictSystemType.CombinedGeneration2to4
+               or typ == Buildings.DHC.Types.DistrictSystemType.Cooling,
           origin={-30,-207},
           rotation=90),
         Rectangle(
diff --git a/Buildings/Experimental/DHC/EnergyTransferStations/BaseClasses/PartialIndirect.mo b/Buildings/DHC/ETS/BaseClasses/PartialIndirect.mo
similarity index 97%
rename from Buildings/Experimental/DHC/EnergyTransferStations/BaseClasses/PartialIndirect.mo
rename to Buildings/DHC/ETS/BaseClasses/PartialIndirect.mo
index f946929fdba..9c42d57a0f3 100644
--- a/Buildings/Experimental/DHC/EnergyTransferStations/BaseClasses/PartialIndirect.mo
+++ b/Buildings/DHC/ETS/BaseClasses/PartialIndirect.mo
@@ -1,8 +1,8 @@
-within Buildings.Experimental.DHC.EnergyTransferStations.BaseClasses;
+within Buildings.DHC.ETS.BaseClasses;
 model PartialIndirect
   "Partial indirect energy transfer station for district energy systems"
   extends
-    Buildings.Experimental.DHC.EnergyTransferStations.BaseClasses.PartialETS(
+    Buildings.DHC.ETS.BaseClasses.PartialETS(
     final have_weaBus=false,
     final have_hotWat=false,
     final have_eleHea=false,
@@ -241,7 +241,7 @@ As shown in the figure below, the building pumping design (constant/variable)
 is specified on the building side and not within the ETS.
 </p>
 <p align=\"center\">
-<img src=\"modelica://Buildings/Resources/Images/Experimental/DHC/EnergyTransferStations/Cooling/Indirect.png\" alt=\"DHC.ETS.Indirect\"/>
+<img src=\"modelica://Buildings/Resources/Images/DHC/ETS/Cooling/Indirect.png\" alt=\"DHC.ETS.Indirect\"/>
 </p>
 <h4>Reference</h4>
 <p>
diff --git a/Buildings/Experimental/DHC/EnergyTransferStations/BaseClasses/Pump_m_flow.mo b/Buildings/DHC/ETS/BaseClasses/Pump_m_flow.mo
similarity index 94%
rename from Buildings/Experimental/DHC/EnergyTransferStations/BaseClasses/Pump_m_flow.mo
rename to Buildings/DHC/ETS/BaseClasses/Pump_m_flow.mo
index 06208c91522..103416cff2e 100644
--- a/Buildings/Experimental/DHC/EnergyTransferStations/BaseClasses/Pump_m_flow.mo
+++ b/Buildings/DHC/ETS/BaseClasses/Pump_m_flow.mo
@@ -1,4 +1,4 @@
-within Buildings.Experimental.DHC.EnergyTransferStations.BaseClasses;
+within Buildings.DHC.ETS.BaseClasses;
 model Pump_m_flow
   "Pump with prescribed mass flow rate"
   extends Buildings.Fluid.Movers.Preconfigured.FlowControlled_m_flow(
diff --git a/Buildings/Experimental/DHC/EnergyTransferStations/BaseClasses/StratifiedTank.mo b/Buildings/DHC/ETS/BaseClasses/StratifiedTank.mo
similarity index 99%
rename from Buildings/Experimental/DHC/EnergyTransferStations/BaseClasses/StratifiedTank.mo
rename to Buildings/DHC/ETS/BaseClasses/StratifiedTank.mo
index dcf81623762..85fd9fac20d 100644
--- a/Buildings/Experimental/DHC/EnergyTransferStations/BaseClasses/StratifiedTank.mo
+++ b/Buildings/DHC/ETS/BaseClasses/StratifiedTank.mo
@@ -1,4 +1,4 @@
-within Buildings.Experimental.DHC.EnergyTransferStations.BaseClasses;
+within Buildings.DHC.ETS.BaseClasses;
 model StratifiedTank
   "Stratified buffer tank model"
   replaceable package Medium=Modelica.Media.Interfaces.PartialMedium
diff --git a/Buildings/Experimental/DHC/EnergyTransferStations/BaseClasses/Validation/CollectorDistributor.mo b/Buildings/DHC/ETS/BaseClasses/Validation/CollectorDistributor.mo
similarity index 97%
rename from Buildings/Experimental/DHC/EnergyTransferStations/BaseClasses/Validation/CollectorDistributor.mo
rename to Buildings/DHC/ETS/BaseClasses/Validation/CollectorDistributor.mo
index 20f7d25e8c9..cac0b08ff44 100644
--- a/Buildings/Experimental/DHC/EnergyTransferStations/BaseClasses/Validation/CollectorDistributor.mo
+++ b/Buildings/DHC/ETS/BaseClasses/Validation/CollectorDistributor.mo
@@ -1,4 +1,4 @@
-within Buildings.Experimental.DHC.EnergyTransferStations.BaseClasses.Validation;
+within Buildings.DHC.ETS.BaseClasses.Validation;
 model CollectorDistributor
   "Validation of collector distributor model"
   extends Modelica.Icons.Example;
@@ -166,7 +166,7 @@ model CollectorDistributor
     k=0.5)
     "Second secondary mass flow rate signal"
     annotation (Placement(transformation(extent={{220,230},{200,250}})));
-  Buildings.Experimental.DHC.EnergyTransferStations.BaseClasses.CollectorDistributor colDis(
+  Buildings.DHC.ETS.BaseClasses.CollectorDistributor colDis(
     redeclare final package Medium=Medium,
     mCon_flow_nominal=fill(
       m_flow_nominal,
@@ -311,7 +311,7 @@ model CollectorDistributor
     k=0.5)
     "Second secondary mass flow rate signal"
     annotation (Placement(transformation(extent={{220,-50},{200,-30}})));
-  Buildings.Experimental.DHC.EnergyTransferStations.BaseClasses.CollectorDistributor colDis1(
+  Buildings.DHC.ETS.BaseClasses.CollectorDistributor colDis1(
     redeclare final package Medium=Medium,
     mCon_flow_nominal=fill(
       m_flow_nominal,
@@ -478,7 +478,7 @@ model CollectorDistributor
     k=0.5)
     "Second secondary mass flow rate signal"
     annotation (Placement(transformation(extent={{220,-330},{200,-310}})));
-  Buildings.Experimental.DHC.EnergyTransferStations.BaseClasses.CollectorDistributor colDis2(
+  Buildings.DHC.ETS.BaseClasses.CollectorDistributor colDis2(
     redeclare final package Medium=Medium,
     mCon_flow_nominal=fill(
       m_flow_nominal,
@@ -670,8 +670,8 @@ equation
       info="<html>
 <p>
 This model validates
-<a href=\"modelica://Buildings.Experimental.DHC.EnergyTransferStations.BaseClasses.CollectorDistributor\">
-Buildings.Experimental.DHC.EnergyTransferStations.BaseClasses.CollectorDistributor</a>
+<a href=\"modelica://Buildings.DHC.ETS.BaseClasses.CollectorDistributor\">
+Buildings.DHC.ETS.BaseClasses.CollectorDistributor</a>
 in a configuration where the model is used to connect
 </p>
 <ol>
@@ -716,7 +716,7 @@ First implementation.
         preserveAspectRatio=false,
         extent={{-260,-440},{260,440}})),
     __Dymola_Commands(
-      file="modelica://Buildings/Resources/Scripts/Dymola/Experimental/DHC/EnergyTransferStations/BaseClasses/Validation/CollectorDistributor.mos" "Simulate and plot"),
+      file="modelica://Buildings/Resources/Scripts/Dymola/DHC/ETS/BaseClasses/Validation/CollectorDistributor.mos" "Simulate and plot"),
     experiment(
       StopTime=5000,
       Tolerance=1e-06));
diff --git a/Buildings/Experimental/DHC/Plants/Cooling/Controls/Validation/package.mo b/Buildings/DHC/ETS/BaseClasses/Validation/package.mo
similarity index 56%
rename from Buildings/Experimental/DHC/Plants/Cooling/Controls/Validation/package.mo
rename to Buildings/DHC/ETS/BaseClasses/Validation/package.mo
index 6cbc8754d37..1b04d16b978 100644
--- a/Buildings/Experimental/DHC/Plants/Cooling/Controls/Validation/package.mo
+++ b/Buildings/DHC/ETS/BaseClasses/Validation/package.mo
@@ -1,4 +1,4 @@
-within Buildings.Experimental.DHC.Plants.Cooling.Controls;
+within Buildings.DHC.ETS.BaseClasses;
 package Validation "Collection of validation models"
   extends Modelica.Icons.ExamplesPackage;
 
@@ -7,8 +7,8 @@ package Validation "Collection of validation models"
       info="<html>
 <p>
 This package contains validation models for the classes in
-<a href=\"modelica://Buildings.Experimental.DHC.Plants.Cooling.Controls\">
-Buildings.Experimental.DHC.Plants.Cooling.Controls</a>.
+<a href=\"modelica://Buildings.DHC.ETS.BaseClasses\">
+Buildings.DHC.ETS.BaseClasses</a>.
 </p>
 </html>"));
 end Validation;
diff --git a/Buildings/Experimental/DHC/EnergyTransferStations/BaseClasses/Validation/package.order b/Buildings/DHC/ETS/BaseClasses/Validation/package.order
similarity index 100%
rename from Buildings/Experimental/DHC/EnergyTransferStations/BaseClasses/Validation/package.order
rename to Buildings/DHC/ETS/BaseClasses/Validation/package.order
diff --git a/Buildings/Experimental/DHC/EnergyTransferStations/BaseClasses/computeCoordinates.mo b/Buildings/DHC/ETS/BaseClasses/computeCoordinates.mo
similarity index 93%
rename from Buildings/Experimental/DHC/EnergyTransferStations/BaseClasses/computeCoordinates.mo
rename to Buildings/DHC/ETS/BaseClasses/computeCoordinates.mo
index 39c2f5801d4..7c8f559fbba 100644
--- a/Buildings/Experimental/DHC/EnergyTransferStations/BaseClasses/computeCoordinates.mo
+++ b/Buildings/DHC/ETS/BaseClasses/computeCoordinates.mo
@@ -1,4 +1,4 @@
-within Buildings.Experimental.DHC.EnergyTransferStations.BaseClasses;
+within Buildings.DHC.ETS.BaseClasses;
 function computeCoordinates
   "Coordinates of evenly distributed boreholes given the number of boreholes"
   extends Modelica.Icons.Function;
diff --git a/Buildings/Experimental/DHC/Loads/BaseClasses/package.mo b/Buildings/DHC/ETS/BaseClasses/package.mo
similarity index 67%
rename from Buildings/Experimental/DHC/Loads/BaseClasses/package.mo
rename to Buildings/DHC/ETS/BaseClasses/package.mo
index 65165242a21..242ce21eaaa 100644
--- a/Buildings/Experimental/DHC/Loads/BaseClasses/package.mo
+++ b/Buildings/DHC/ETS/BaseClasses/package.mo
@@ -1,4 +1,4 @@
-within Buildings.Experimental.DHC.Loads;
+within Buildings.DHC.ETS;
 package BaseClasses "Package with base classes"
   extends Modelica.Icons.BasesPackage;
 
@@ -8,8 +8,8 @@ package BaseClasses "Package with base classes"
       info="<html>
 <p>
 This package contains base classes that are used to construct the classes in
-<a href=\"modelica://Buildings.Experimental.DHC.Loads\">
-Buildings.Experimental.DHC.Loads</a>.
+<a href=\"modelica://Buildings.DHC.ETS\">
+Buildings.DHC.ETS</a>.
 </p>
 </html>"));
 end BaseClasses;
diff --git a/Buildings/Experimental/DHC/EnergyTransferStations/BaseClasses/package.order b/Buildings/DHC/ETS/BaseClasses/package.order
similarity index 100%
rename from Buildings/Experimental/DHC/EnergyTransferStations/BaseClasses/package.order
rename to Buildings/DHC/ETS/BaseClasses/package.order
diff --git a/Buildings/Experimental/DHC/EnergyTransferStations/Combined/BaseClasses/PartialHeatPumpHeatExchanger.mo b/Buildings/DHC/ETS/Combined/BaseClasses/PartialHeatPumpHeatExchanger.mo
similarity index 95%
rename from Buildings/Experimental/DHC/EnergyTransferStations/Combined/BaseClasses/PartialHeatPumpHeatExchanger.mo
rename to Buildings/DHC/ETS/Combined/BaseClasses/PartialHeatPumpHeatExchanger.mo
index 2992db9f957..87dbb79c7b4 100644
--- a/Buildings/Experimental/DHC/EnergyTransferStations/Combined/BaseClasses/PartialHeatPumpHeatExchanger.mo
+++ b/Buildings/DHC/ETS/Combined/BaseClasses/PartialHeatPumpHeatExchanger.mo
@@ -1,9 +1,9 @@
-within Buildings.Experimental.DHC.EnergyTransferStations.Combined.BaseClasses;
+within Buildings.DHC.ETS.Combined.BaseClasses;
 model PartialHeatPumpHeatExchanger
   "Partial model of a substation with heat pump and compressor-less cooling"
   extends
-    Buildings.Experimental.DHC.EnergyTransferStations.BaseClasses.PartialETS(
-    final typ=Buildings.Experimental.DHC.Types.DistrictSystemType.CombinedGeneration5,
+    Buildings.DHC.ETS.BaseClasses.PartialETS(
+    final typ=Buildings.DHC.Types.DistrictSystemType.CombinedGeneration5,
     final have_weaBus=false,
     final have_chiWat=true,
     final have_heaWat=true,
@@ -187,7 +187,7 @@ model PartialHeatPumpHeatExchanger
     final energyDynamics=mixingVolumeEnergyDynamics)
     "Mixing volume to break algebraic loops and to emulate the delay of the substation"
     annotation (Placement(transformation(extent={{250,-360},{270,-380}})));
-  Buildings.Experimental.DHC.EnergyTransferStations.BaseClasses.Pump_m_flow pum1HexChi(
+  Buildings.DHC.ETS.BaseClasses.Pump_m_flow pum1HexChi(
     redeclare final package Medium = MediumSer,
     final m_flow_nominal=m1HexChi_flow_nominal,
     final allowFlowReversal=allowFlowReversalSer,
@@ -241,7 +241,7 @@ model PartialHeatPumpHeatExchanger
   Buildings.Controls.OBC.CDL.Reals.MultiplyByParameter gai2(final k=
         m1HexChi_flow_nominal)
     annotation (Placement(transformation(extent={{-108,-210},{-88,-190}})));
-  Buildings.Experimental.DHC.EnergyTransferStations.Combined.Controls.PIDWithEnable conTChiWat(
+  Buildings.DHC.ETS.Combined.Controls.PIDWithEnable conTChiWat(
     k=0.05,
     Ti=120,
     yMax=1,
@@ -290,20 +290,20 @@ model PartialHeatPumpHeatExchanger
         extent={{-10,-10},{10,10}},
         rotation=0,
         origin={140,-280})));
-  Buildings.Experimental.DHC.EnergyTransferStations.Combined.Subsystems.SwitchBox
+  Buildings.DHC.ETS.Combined.Subsystems.SwitchBox
     swiFlo(
     redeclare final package Medium = MediumSer,
     final m_flow_nominal=mSerWat_flow_nominal,
     dpValve_nominal=1e-4)                      "Flow switch box"
     annotation (Placement(transformation(extent={{-10,-390},{10,-370}})));
-  Buildings.Experimental.DHC.EnergyTransferStations.BaseClasses.Junction bypHeaWatSup(
+  Buildings.DHC.ETS.BaseClasses.Junction bypHeaWatSup(
     redeclare final package Medium = MediumBui, final m_flow_nominal=proHeaWat.mCon_flow_nominal
         *{1,-1,-1}) "Bypass heating water (supply)" annotation (Placement(
         transformation(
         extent={{-10,-10},{10,10}},
         rotation=0,
         origin={100,260})));
-  Buildings.Experimental.DHC.EnergyTransferStations.BaseClasses.Junction bypHeaWatRet(
+  Buildings.DHC.ETS.BaseClasses.Junction bypHeaWatRet(
     redeclare final package Medium = MediumBui, final m_flow_nominal=proHeaWat.mCon_flow_nominal
         *{1,-1,1})
     "Bypass heating water (return)"
@@ -315,7 +315,7 @@ model PartialHeatPumpHeatExchanger
   Buildings.Controls.OBC.CDL.Logical.TrueFalseHold enaHea(
     trueHoldDuration=15*60) "Enable heating"
     annotation (Placement(transformation(extent={{-140,150},{-120,170}})));
-  Buildings.Experimental.DHC.EnergyTransferStations.Combined.Subsystems.HeatPump proHeaWat(
+  Buildings.DHC.ETS.Combined.Subsystems.HeatPump proHeaWat(
     redeclare final package Medium1 = MediumBui,
     redeclare final package Medium2 = MediumSer,
     dT_nominal=dT_nominal,
@@ -378,7 +378,7 @@ model PartialHeatPumpHeatExchanger
   Buildings.Controls.OBC.CDL.Reals.MultiplyByParameter capFloHHW(
     final k=cpBui_default) if have_varFloEva or have_varFloCon "Capacity flow rate"
     annotation (Placement(transformation(extent={{-220,310},{-200,330}})));
-  Buildings.Experimental.DHC.EnergyTransferStations.Combined.Controls.PrimaryVariableFlow conFloConHHW(
+  Buildings.DHC.ETS.Combined.Controls.PrimaryVariableFlow conFloConHHW(
     final Q_flow_nominal=QHeaWat_flow_nominal,
     final dT_nominal=dT_nominal,
     final ratFloMin=ratFloMin,
@@ -555,8 +555,8 @@ to radiant cooling systems, for instance at 19&deg;C.
 </ul>
 <p>
 The space heating heating function is provided by a water-to-water heat pump
-<a href=\"modelica://Buildings.Experimental.DHC.EnergyTransferStations.Combined.Subsystems.HeatPump\">
-Buildings.Experimental.DHC.EnergyTransferStations.Combined.Subsystems.HeatPump</a>.
+<a href=\"modelica://Buildings.DHC.ETS.Combined.Subsystems.HeatPump\">
+Buildings.DHC.ETS.Combined.Subsystems.HeatPump</a>.
 </p>
 <ul>
 <li>
@@ -565,20 +565,20 @@ with a variable mass flow rate to maintain a difference between supply and
 return water of <code>dT_nominal</code>,
 with a lower limit of mass flow specified by the ratio <code>ratFloMin</code>.
 The control logic is implemented and described in
-<a href=\"modelica://Buildings.Experimental.DHC.EnergyTransferStations.Combined.Controls.PrimaryVariableFlow\">
-Buildings.Experimental.DHC.EnergyTransferStations.Combined.Controls.PrimaryVariableFlow</a>.
+<a href=\"modelica://Buildings.DHC.ETS.Combined.Controls.PrimaryVariableFlow\">
+Buildings.DHC.ETS.Combined.Controls.PrimaryVariableFlow</a>.
 The model can also represent a constant flow condenser loop
 by setting <code>have_varFloCon</code> to <code>false</code>.
 </li>
 <li>
 The evaporator loop is controlled according to the documentation in
-<a href=\"modelica://Buildings.Experimental.DHC.EnergyTransferStations.Combined.Subsystems.HeatPump\">
-Buildings.Experimental.DHC.EnergyTransferStations.Combined.Subsystems.HeatPump</a>.
+<a href=\"modelica://Buildings.DHC.ETS.Combined.Subsystems.HeatPump\">
+Buildings.DHC.ETS.Combined.Subsystems.HeatPump</a>.
 Evaporator water is supplied by mixing flow directly from the district line with
 flow leaving the district side of the cooling heat exchanger.
 The hydronic arrangement modeled in
-<a href=\"modelica://Buildings.Experimental.DHC.EnergyTransferStations.Combined.Subsystems.SwitchBox\">
-Buildings.Experimental.DHC.EnergyTransferStations.Combined.Subsystems.SwitchBox</a>
+<a href=\"modelica://Buildings.DHC.ETS.Combined.Subsystems.SwitchBox\">
+Buildings.DHC.ETS.Combined.Subsystems.SwitchBox</a>
 ensures that the resulting fluid stream in the district line always flows
 in the same direction.
 </li>
diff --git a/Buildings/Experimental/DHC/EnergyTransferStations/Combined/BaseClasses/PartialParallel.mo b/Buildings/DHC/ETS/Combined/BaseClasses/PartialParallel.mo
similarity index 89%
rename from Buildings/Experimental/DHC/EnergyTransferStations/Combined/BaseClasses/PartialParallel.mo
rename to Buildings/DHC/ETS/Combined/BaseClasses/PartialParallel.mo
index 85485d752e8..8d8074ec025 100644
--- a/Buildings/Experimental/DHC/EnergyTransferStations/Combined/BaseClasses/PartialParallel.mo
+++ b/Buildings/DHC/ETS/Combined/BaseClasses/PartialParallel.mo
@@ -1,8 +1,8 @@
-within Buildings.Experimental.DHC.EnergyTransferStations.Combined.BaseClasses;
+within Buildings.DHC.ETS.Combined.BaseClasses;
 model PartialParallel
   "Partial ETS model with district heat exchanger and parallel connection of production systems"
-  extends Buildings.Experimental.DHC.EnergyTransferStations.BaseClasses.PartialETS(
-    final typ=Buildings.Experimental.DHC.Types.DistrictSystemType.CombinedGeneration5,
+  extends Buildings.DHC.ETS.BaseClasses.PartialETS(
+    final typ=Buildings.DHC.Types.DistrictSystemType.CombinedGeneration5,
     final have_heaWat=true,
     final have_chiWat=true,
     final have_pum=true,
@@ -10,8 +10,8 @@ model PartialParallel
     have_eleHea=false,
     have_weaBus=false);
 
-  parameter Buildings.Experimental.DHC.EnergyTransferStations.Types.ConnectionConfiguration conCon=
-      Buildings.Experimental.DHC.EnergyTransferStations.Types.ConnectionConfiguration.Pump
+  parameter Buildings.DHC.ETS.Types.ConnectionConfiguration conCon=
+      Buildings.DHC.ETS.Types.ConnectionConfiguration.Pump
     "District connection configuration" annotation (Evaluate=true);
   parameter Integer nSysHea
     "Number of heating systems"
@@ -93,8 +93,8 @@ model PartialParallel
     "Chilled water supply temperature set point"
     annotation (Placement(transformation(extent={{-340,-80},{-300,-40}}),iconTransformation(extent={{-380,-140},{-300,-60}})));
   // COMPONENTS
-  replaceable Buildings.Experimental.DHC.EnergyTransferStations.Combined.Controls.BaseClasses.PartialSupervisory conSup
-    constrainedby Buildings.Experimental.DHC.EnergyTransferStations.Combined.Controls.BaseClasses.PartialSupervisory(
+  replaceable Buildings.DHC.ETS.Combined.Controls.BaseClasses.PartialSupervisory conSup
+    constrainedby Buildings.DHC.ETS.Combined.Controls.BaseClasses.PartialSupervisory(
       final nSouAmb=nSouAmb)
     "Supervisory controller"
     annotation (Placement(transformation(extent={{-260,12},{-240,32}})));
@@ -110,7 +110,7 @@ model PartialParallel
     final m_flow_nominal=colAmbWat.mDis_flow_nominal,
     use_inputFilter=false) "Condenser to ambient loop isolation valve"
     annotation (Placement(transformation(extent={{-70,-130},{-50,-110}})));
-  Buildings.Experimental.DHC.EnergyTransferStations.Combined.Subsystems.HeatExchanger hex(
+  Buildings.DHC.ETS.Combined.Subsystems.HeatExchanger hex(
     redeclare final package Medium1=MediumSer,
     redeclare final package Medium2=MediumBui,
     final allowFlowReversal1=allowFlowReversalSer,
@@ -126,7 +126,7 @@ model PartialParallel
     final spePum1Min=spePum1HexMin,
     final spePum2Min=spePum2HexMin) "District heat exchanger"
     annotation (Placement(transformation(extent={{-10,-244},{10,-264}})));
-  Buildings.Experimental.DHC.EnergyTransferStations.BaseClasses.StratifiedTank tanChiWat(
+  Buildings.DHC.ETS.BaseClasses.StratifiedTank tanChiWat(
     redeclare final package Medium = MediumBui,
     final m_flow_nominal=colChiWat.mDis_flow_nominal,
     final VTan=VTanChiWat,
@@ -134,7 +134,7 @@ model PartialParallel
     final dIns=dInsTanChiWat,
     final nSeg=nSegTan) "Chilled water tank"
     annotation (Placement(transformation(extent={{180,96},{200,116}})));
-  Buildings.Experimental.DHC.EnergyTransferStations.BaseClasses.StratifiedTank tanHeaWat(
+  Buildings.DHC.ETS.BaseClasses.StratifiedTank tanHeaWat(
     redeclare final package Medium = MediumBui,
     final m_flow_nominal=colHeaWat.mDis_flow_nominal,
     final VTan=VTanHeaWat,
@@ -142,7 +142,7 @@ model PartialParallel
     final dIns=dInsTanHeaWat,
     final nSeg=nSegTan) "Heating water tank"
     annotation (Placement(transformation(extent={{-220,96},{-200,116}})));
-  Buildings.Experimental.DHC.EnergyTransferStations.BaseClasses.CollectorDistributor colChiWat(
+  Buildings.DHC.ETS.BaseClasses.CollectorDistributor colChiWat(
     redeclare final package Medium = MediumBui,
     final nCon=1 + nSysCoo,
     mCon_flow_nominal={colAmbWat.mDis_flow_nominal})
@@ -151,7 +151,7 @@ model PartialParallel
         extent={{-20,10},{20,-10}},
         rotation=180,
         origin={120,-34})));
-  Buildings.Experimental.DHC.EnergyTransferStations.BaseClasses.CollectorDistributor colHeaWat(
+  Buildings.DHC.ETS.BaseClasses.CollectorDistributor colHeaWat(
     redeclare final package Medium = MediumBui,
     final nCon=1 + nSysHea,
     mCon_flow_nominal={colAmbWat.mDis_flow_nominal})
@@ -160,7 +160,7 @@ model PartialParallel
         extent={{20,10},{-20,-10}},
         rotation=180,
         origin={-120,-34})));
-  Buildings.Experimental.DHC.EnergyTransferStations.BaseClasses.CollectorDistributor colAmbWat(
+  Buildings.DHC.ETS.BaseClasses.CollectorDistributor colAmbWat(
     redeclare final package Medium = MediumBui,
     final nCon=nSouAmb,
     mCon_flow_nominal={hex.m2_flow_nominal})
@@ -190,7 +190,7 @@ model PartialParallel
         origin={190,-34})));
 protected
   parameter Boolean have_val1Hex=
-    conCon == DHC.EnergyTransferStations.Types.ConnectionConfiguration.TwoWayValve
+    conCon == DHC.ETS.Types.ConnectionConfiguration.TwoWayValve
     "True in case of control valve on district side, false in case of a pump";
 equation
   connect(hex.PPum,totPPum.u[1])
@@ -286,8 +286,8 @@ of systems serving as ambient sources (including the district heat exchanger).
 <li>
 The connection to the district loop is realized with a heat exchanger, according
 to the operating principles described in
-<a href=\"modelica://Buildings.Experimental.DHC.EnergyTransferStations.Combined.Subsystems.HeatExchanger\">
-Buildings.Experimental.DHC.EnergyTransferStations.Combined.Subsystems.HeatExchanger</a>.
+<a href=\"modelica://Buildings.DHC.ETS.Combined.Subsystems.HeatExchanger\">
+Buildings.DHC.ETS.Combined.Subsystems.HeatExchanger</a>.
 </li>
 <li>
 The connection of the heating water and chilled water production systems
@@ -297,8 +297,8 @@ to the systems serving as ambient sources is realized in parallel.
 A replaceable partial class is used to represent a supervisory controller, which
 must be replaced by a control block providing at least the control signals
 listed in
-<a href=\"modelica://Buildings.Experimental.DHC.EnergyTransferStations.Combined.Controls.BaseClasses.PartialSupervisory\">
-Buildings.Experimental.DHC.EnergyTransferStations.Combined.Controls.BaseClasses.PartialSupervisory</a>.
+<a href=\"modelica://Buildings.DHC.ETS.Combined.Controls.BaseClasses.PartialSupervisory\">
+Buildings.DHC.ETS.Combined.Controls.BaseClasses.PartialSupervisory</a>.
 </li>
 </ul>
 <p>
@@ -335,7 +335,7 @@ being hydronically connected.
 </p>
 <p>
 <img alt=\"Sequence chart\"
-src=\"modelica://Buildings/Resources/Images/Experimental/DHC/EnergyTransferStations/Combined/BaseClasses/PartialParallel.png\"/>
+src=\"modelica://Buildings/Resources/Images/DHC/ETS/Combined/BaseClasses/PartialParallel.png\"/>
 </p>
 </html>",
 revisions="<html>
diff --git a/Buildings/Experimental/DHC/EnergyTransferStations/Combined/BaseClasses/package.mo b/Buildings/DHC/ETS/Combined/BaseClasses/package.mo
similarity index 54%
rename from Buildings/Experimental/DHC/EnergyTransferStations/Combined/BaseClasses/package.mo
rename to Buildings/DHC/ETS/Combined/BaseClasses/package.mo
index b1caeb30b05..15e067e7c04 100644
--- a/Buildings/Experimental/DHC/EnergyTransferStations/Combined/BaseClasses/package.mo
+++ b/Buildings/DHC/ETS/Combined/BaseClasses/package.mo
@@ -1,4 +1,4 @@
-within Buildings.Experimental.DHC.EnergyTransferStations.Combined;
+within Buildings.DHC.ETS.Combined;
 package BaseClasses "Package with base classes"
   extends Modelica.Icons.BasesPackage;
 
@@ -7,8 +7,8 @@ package BaseClasses "Package with base classes"
       info="<html>
 <p>
 This package contains base classes that are used to construct the classes in
-<a href=\"modelica://Buildings.Experimental.DHC.EnergyTransferStations.Combined\">
-Buildings.Experimental.DHC.EnergyTransferStations.Combined</a>.
+<a href=\"modelica://Buildings.DHC.ETS.Combined\">
+Buildings.DHC.ETS.Combined</a>.
 </p>
 </html>"));
 end BaseClasses;
diff --git a/Buildings/Experimental/DHC/EnergyTransferStations/Combined/BaseClasses/package.order b/Buildings/DHC/ETS/Combined/BaseClasses/package.order
similarity index 100%
rename from Buildings/Experimental/DHC/EnergyTransferStations/Combined/BaseClasses/package.order
rename to Buildings/DHC/ETS/Combined/BaseClasses/package.order
diff --git a/Buildings/Experimental/DHC/EnergyTransferStations/Combined/ChillerBorefield.mo b/Buildings/DHC/ETS/Combined/ChillerBorefield.mo
similarity index 94%
rename from Buildings/Experimental/DHC/EnergyTransferStations/Combined/ChillerBorefield.mo
rename to Buildings/DHC/ETS/Combined/ChillerBorefield.mo
index b26311db701..5e1d4bc2e1e 100644
--- a/Buildings/Experimental/DHC/EnergyTransferStations/Combined/ChillerBorefield.mo
+++ b/Buildings/DHC/ETS/Combined/ChillerBorefield.mo
@@ -1,10 +1,10 @@
-within Buildings.Experimental.DHC.EnergyTransferStations.Combined;
+within Buildings.DHC.ETS.Combined;
 model ChillerBorefield "ETS model for 5GDHC systems with heat recovery chiller and optional borefield"
-  extends Buildings.Experimental.DHC.EnergyTransferStations.Combined.BaseClasses.PartialParallel(
+  extends Buildings.DHC.ETS.Combined.BaseClasses.PartialParallel(
     final have_eleCoo=true,
     final have_fan=false,
-    redeclare replaceable Buildings.Experimental.DHC.EnergyTransferStations.Combined.Controls.Supervisory conSup
-      constrainedby Buildings.Experimental.DHC.EnergyTransferStations.Combined.Controls.Supervisory(
+    redeclare replaceable Buildings.DHC.ETS.Combined.Controls.Supervisory conSup
+      constrainedby Buildings.DHC.ETS.Combined.Controls.Supervisory(
         final controllerType=controllerType,
         final kHot=kHot,
         final kCol=kCol,
@@ -130,7 +130,7 @@ model ChillerBorefield "ETS model for 5GDHC systems with heat recovery chiller a
     annotation (Dialog(group="Supervisory controller"));
 
   replaceable
-    Buildings.Experimental.DHC.EnergyTransferStations.Combined.Subsystems.Chiller
+    Buildings.DHC.ETS.Combined.Subsystems.Chiller
     chi(
     redeclare final package Medium = MediumBui,
     final dpCon_nominal=dpCon_nominal,
@@ -138,7 +138,7 @@ model ChillerBorefield "ETS model for 5GDHC systems with heat recovery chiller a
     final dat=datChi) "Chiller" annotation (Dialog(group="Chiller"), Placement(
         transformation(extent={{-10,-16},{10,4}})));
   replaceable
-    Buildings.Experimental.DHC.EnergyTransferStations.Combined.Subsystems.Borefield
+    Buildings.DHC.ETS.Combined.Subsystems.Borefield
     borFie(
     redeclare final package Medium = MediumBui,
     final datBorFie=datBorFie,
@@ -155,7 +155,7 @@ model ChillerBorefield "ETS model for 5GDHC systems with heat recovery chiller a
     final k=0)
     "Zero power"
     annotation (Placement(transformation(extent={{220,50},{240,70}})));
-  Buildings.Experimental.DHC.Networks.BaseClasses.DifferenceEnthalpyFlowRate dHFloHeaWat(
+  Buildings.DHC.Networks.BaseClasses.DifferenceEnthalpyFlowRate dHFloHeaWat(
     redeclare final package Medium1 = MediumBui,
     final m_flow_nominal=colHeaWat.mDis_flow_nominal)
     "Variation of enthalpy flow rate"
@@ -174,14 +174,14 @@ model ChillerBorefield "ETS model for 5GDHC systems with heat recovery chiller a
       iconTransformation(extent={{-40,-40},{40,40}},
         rotation=-90,
         origin={280,-340})));
-  Buildings.Experimental.DHC.Networks.BaseClasses.DifferenceEnthalpyFlowRate dHFloChiWat(
+  Buildings.DHC.Networks.BaseClasses.DifferenceEnthalpyFlowRate dHFloChiWat(
     redeclare final package Medium1 = MediumBui,
     final m_flow_nominal=colChiWat.mDis_flow_nominal)
     "Variation of enthalpy flow rate"
     annotation (Placement(transformation(extent={{-10,10},{10,-10}},
         rotation=90,
         origin={274,130})));
-  Buildings.Experimental.DHC.EnergyTransferStations.Combined.Subsystems.WatersideEconomizer
+  Buildings.DHC.ETS.Combined.Subsystems.WatersideEconomizer
     WSE(
     redeclare final package Medium1 = MediumSer,
     redeclare final package Medium2 = MediumBui,
@@ -197,7 +197,7 @@ model ChillerBorefield "ETS model for 5GDHC systems with heat recovery chiller a
     final T_b2_nominal=T_b2WSE_nominal,
     final y1Min=y1WSEMin) if have_WSE "Waterside economizer"
     annotation (Placement(transformation(extent={{220,116},{240,136}})));
-  Buildings.Experimental.DHC.EnergyTransferStations.BaseClasses.Junction splWSE(
+  Buildings.DHC.ETS.BaseClasses.Junction splWSE(
     redeclare final package Medium = MediumSer,
     final m_flow_nominal={
       hex.m1_flow_nominal + m1WSE_flow_nominal,
@@ -205,7 +205,7 @@ model ChillerBorefield "ETS model for 5GDHC systems with heat recovery chiller a
       -m1WSE_flow_nominal})
     "Flow splitter for WSE"
     annotation (Placement(transformation(extent={{-230,-270},{-210,-250}})));
-  Buildings.Experimental.DHC.EnergyTransferStations.BaseClasses.Junction mixWSE(
+  Buildings.DHC.ETS.BaseClasses.Junction mixWSE(
     redeclare final package Medium = MediumSer,
     final m_flow_nominal={
       hex.m1_flow_nominal,
@@ -340,8 +340,8 @@ below.
 <ul>
 <li>
 The heating and cooling functions are provided by a heat recovery chiller, see
-<a href=\"modelica://Buildings.Experimental.DHC.EnergyTransferStations.Combined.Subsystems.Chiller\">
-Buildings.Experimental.DHC.EnergyTransferStations.Combined.Subsystems.Chiller</a>
+<a href=\"modelica://Buildings.DHC.ETS.Combined.Subsystems.Chiller\">
+Buildings.DHC.ETS.Combined.Subsystems.Chiller</a>
 for the operating principles and modeling assumptions.
 The condenser and evaporator loops are equipped with constant speed pumps.
 </li>
@@ -351,8 +351,8 @@ and the evaporator side of the chiller by controlling in sequence an optional
 geothermal borefield (priority system), the district heat exchanger (second
 priority system), and ultimately the chiller, by resetting down the chilled
 water supply temperature, see
-<a href=\"modelica://Buildings.Experimental.DHC.EnergyTransferStations.Combined.Controls.Supervisory\">
-Buildings.Experimental.DHC.EnergyTransferStations.Combined.Controls.Supervisory</a>
+<a href=\"modelica://Buildings.DHC.ETS.Combined.Controls.Supervisory\">
+Buildings.DHC.ETS.Combined.Controls.Supervisory</a>
 for a detailed description.
 The borefield and district heat exchanger loops are equipped with
 variable speed pumps modulated by the supervisory controller.
@@ -365,13 +365,13 @@ building has no corresponding demand (e.g., based on the requests yielded by
 the terminal unit controllers, in conjunction with a schedule).
 This will significantly improve the system performance as it is a
 necessary condition for the chiller to be operated at a lower lift, see
-<a href=\"modelica://Buildings.Experimental.DHC.EnergyTransferStations.Combined.Controls.Reset\">
-Buildings.Experimental.DHC.EnergyTransferStations.Combined.Controls.Reset</a>.
+<a href=\"modelica://Buildings.DHC.ETS.Combined.Controls.Reset\">
+Buildings.DHC.ETS.Combined.Controls.Reset</a>.
 <br/>
 </p>
 <p align=\"center\">
 <img alt=\"System schematics\"
-src=\"modelica://Buildings/Resources/Images/Experimental/DHC/EnergyTransferStations/Combined/ChillerBorefield.png\"/>
+src=\"modelica://Buildings/Resources/Images/DHC/ETS/Combined/ChillerBorefield.png\"/>
 </p>
 </html>"),
     Icon(graphics={
diff --git a/Buildings/Experimental/DHC/EnergyTransferStations/Combined/Controls/BaseClasses/PartialSupervisory.mo b/Buildings/DHC/ETS/Combined/Controls/BaseClasses/PartialSupervisory.mo
similarity index 98%
rename from Buildings/Experimental/DHC/EnergyTransferStations/Combined/Controls/BaseClasses/PartialSupervisory.mo
rename to Buildings/DHC/ETS/Combined/Controls/BaseClasses/PartialSupervisory.mo
index 12524b78e3b..f1c042b7d70 100644
--- a/Buildings/Experimental/DHC/EnergyTransferStations/Combined/Controls/BaseClasses/PartialSupervisory.mo
+++ b/Buildings/DHC/ETS/Combined/Controls/BaseClasses/PartialSupervisory.mo
@@ -1,4 +1,4 @@
-within Buildings.Experimental.DHC.EnergyTransferStations.Combined.Controls.BaseClasses;
+within Buildings.DHC.ETS.Combined.Controls.BaseClasses;
 partial block PartialSupervisory
   "Partial model for supervisory controller"
   extends Modelica.Blocks.Icons.Block;
diff --git a/Buildings/Experimental/DHC/EnergyTransferStations/BaseClasses/package.mo b/Buildings/DHC/ETS/Combined/Controls/BaseClasses/package.mo
similarity index 60%
rename from Buildings/Experimental/DHC/EnergyTransferStations/BaseClasses/package.mo
rename to Buildings/DHC/ETS/Combined/Controls/BaseClasses/package.mo
index 73bbca4a305..6b3a7b1599d 100644
--- a/Buildings/Experimental/DHC/EnergyTransferStations/BaseClasses/package.mo
+++ b/Buildings/DHC/ETS/Combined/Controls/BaseClasses/package.mo
@@ -1,4 +1,4 @@
-within Buildings.Experimental.DHC.EnergyTransferStations;
+within Buildings.DHC.ETS.Combined.Controls;
 package BaseClasses "Package with base classes"
   extends Modelica.Icons.BasesPackage;
 
@@ -8,8 +8,8 @@ package BaseClasses "Package with base classes"
       info="<html>
 <p>
 This package contains base classes that are used to construct the classes in
-<a href=\"modelica://Buildings.Experimental.DHC.EnergyTransferStations\">
-Buildings.Experimental.DHC.EnergyTransferStations</a>.
+<a href=\"modelica://Buildings.DHC.ETS.Combined.Controls\">
+Buildings.DHC.ETS.Combined.Controls</a>.
 </p>
 </html>"));
 end BaseClasses;
diff --git a/Buildings/Experimental/DHC/EnergyTransferStations/Combined/Controls/BaseClasses/package.order b/Buildings/DHC/ETS/Combined/Controls/BaseClasses/package.order
similarity index 100%
rename from Buildings/Experimental/DHC/EnergyTransferStations/Combined/Controls/BaseClasses/package.order
rename to Buildings/DHC/ETS/Combined/Controls/BaseClasses/package.order
diff --git a/Buildings/Experimental/DHC/EnergyTransferStations/Combined/Controls/Borefield.mo b/Buildings/DHC/ETS/Combined/Controls/Borefield.mo
similarity index 97%
rename from Buildings/Experimental/DHC/EnergyTransferStations/Combined/Controls/Borefield.mo
rename to Buildings/DHC/ETS/Combined/Controls/Borefield.mo
index a7043a1dfce..df5e7f482a6 100644
--- a/Buildings/Experimental/DHC/EnergyTransferStations/Combined/Controls/Borefield.mo
+++ b/Buildings/DHC/ETS/Combined/Controls/Borefield.mo
@@ -1,4 +1,4 @@
-within Buildings.Experimental.DHC.EnergyTransferStations.Combined.Controls;
+within Buildings.DHC.ETS.Combined.Controls;
 model Borefield
   "Borefield controller"
   extends Modelica.Blocks.Icons.Block;
@@ -164,8 +164,8 @@ First implementation.
 This block implements the control logic for the borefield system.
 The main control signal <code>u</code> is yielded by the hot side
 or cold side controller, see for instance
-<a href=\"modelica://Buildings.Experimental.DHC.EnergyTransferStations.Combined.Controls.SideHot\">
-Buildings.Experimental.DHC.EnergyTransferStations.Combined.Controls.SideHot</a>.
+<a href=\"modelica://Buildings.DHC.ETS.Combined.Controls.SideHot\">
+Buildings.DHC.ETS.Combined.Controls.SideHot</a>.
 </p>
 <p>
 The system is enabled when
diff --git a/Buildings/Experimental/DHC/EnergyTransferStations/Combined/Controls/Chiller.mo b/Buildings/DHC/ETS/Combined/Controls/Chiller.mo
similarity index 98%
rename from Buildings/Experimental/DHC/EnergyTransferStations/Combined/Controls/Chiller.mo
rename to Buildings/DHC/ETS/Combined/Controls/Chiller.mo
index abb7822d164..17a247107b5 100644
--- a/Buildings/Experimental/DHC/EnergyTransferStations/Combined/Controls/Chiller.mo
+++ b/Buildings/DHC/ETS/Combined/Controls/Chiller.mo
@@ -1,4 +1,4 @@
-within Buildings.Experimental.DHC.EnergyTransferStations.Combined.Controls;
+within Buildings.DHC.ETS.Combined.Controls;
 model Chiller
   "Chiller controller"
   extends Modelica.Blocks.Icons.Block;
diff --git a/Buildings/Experimental/DHC/EnergyTransferStations/Combined/Controls/HeatExchanger.mo b/Buildings/DHC/ETS/Combined/Controls/HeatExchanger.mo
similarity index 96%
rename from Buildings/Experimental/DHC/EnergyTransferStations/Combined/Controls/HeatExchanger.mo
rename to Buildings/DHC/ETS/Combined/Controls/HeatExchanger.mo
index 16fa058df18..62f430841a3 100644
--- a/Buildings/Experimental/DHC/EnergyTransferStations/Combined/Controls/HeatExchanger.mo
+++ b/Buildings/DHC/ETS/Combined/Controls/HeatExchanger.mo
@@ -1,8 +1,8 @@
-within Buildings.Experimental.DHC.EnergyTransferStations.Combined.Controls;
+within Buildings.DHC.ETS.Combined.Controls;
 model HeatExchanger
   "District heat exchanger controller"
   extends Modelica.Blocks.Icons.Block;
-  parameter DHC.EnergyTransferStations.Types.ConnectionConfiguration conCon
+  parameter DHC.ETS.Types.ConnectionConfiguration conCon
     "District connection configuration" annotation (Evaluate=true);
   parameter Real spePum1Min(
     final unit="1",
@@ -91,7 +91,7 @@ model HeatExchanger
     annotation (Placement(transformation(extent={{90,10},{110,30}})));
 protected
   parameter Boolean have_val1=conCon ==
-    DHC.EnergyTransferStations.Types.ConnectionConfiguration.TwoWayValve
+    DHC.ETS.Types.ConnectionConfiguration.TwoWayValve
     "True in case of control valve on district side, false in case of a pump";
 equation
   connect(swiOff1.y, y1) annotation (Line(points={{182,-60},{200,-60},{200,40},
@@ -180,8 +180,8 @@ which realizes the interface between the building system and the district system
 </p>
 <p>
 The input signal <code>u</code> is yielded by the supervisory controller, see
-<a href=\"modelica://Buildings.Experimental.DHC.EnergyTransferStations.Combined.Controls.Supervisory\">
-Buildings.Experimental.DHC.EnergyTransferStations.Combined.Controls.Supervisory</a>.
+<a href=\"modelica://Buildings.DHC.ETS.Combined.Controls.Supervisory\">
+Buildings.DHC.ETS.Combined.Controls.Supervisory</a>.
 The primary and secondary circuits are enabled to operate if this input signal
 is greater than zero and the return position of at least one isolation valve
 is greater than 90%.
diff --git a/Buildings/Experimental/DHC/EnergyTransferStations/Combined/Controls/PIDWithEnable.mo b/Buildings/DHC/ETS/Combined/Controls/PIDWithEnable.mo
similarity index 98%
rename from Buildings/Experimental/DHC/EnergyTransferStations/Combined/Controls/PIDWithEnable.mo
rename to Buildings/DHC/ETS/Combined/Controls/PIDWithEnable.mo
index 63909fe9203..092ac4c3d8e 100644
--- a/Buildings/Experimental/DHC/EnergyTransferStations/Combined/Controls/PIDWithEnable.mo
+++ b/Buildings/DHC/ETS/Combined/Controls/PIDWithEnable.mo
@@ -1,4 +1,4 @@
-within Buildings.Experimental.DHC.EnergyTransferStations.Combined.Controls;
+within Buildings.DHC.ETS.Combined.Controls;
 block PIDWithEnable
   "PID controller with enable signal"
   extends Modelica.Blocks.Icons.Block;
diff --git a/Buildings/Experimental/DHC/EnergyTransferStations/Combined/Controls/PredictLeavingTemperature.mo b/Buildings/DHC/ETS/Combined/Controls/PredictLeavingTemperature.mo
similarity index 87%
rename from Buildings/Experimental/DHC/EnergyTransferStations/Combined/Controls/PredictLeavingTemperature.mo
rename to Buildings/DHC/ETS/Combined/Controls/PredictLeavingTemperature.mo
index d035fca2fbd..70e4802c708 100644
--- a/Buildings/Experimental/DHC/EnergyTransferStations/Combined/Controls/PredictLeavingTemperature.mo
+++ b/Buildings/DHC/ETS/Combined/Controls/PredictLeavingTemperature.mo
@@ -1,4 +1,4 @@
-within Buildings.Experimental.DHC.EnergyTransferStations.Combined.Controls;
+within Buildings.DHC.ETS.Combined.Controls;
 model PredictLeavingTemperature
   "Block that predicts heat exchanger leaving water temperature"
   extends Modelica.Blocks.Icons.Block;
@@ -44,8 +44,8 @@ First implementation.
 <p>
 This block computes the predicted heat exchanger leaving water temperature
 as used in
-<a href=\"modelica://Buildings.Experimental.DHC.EnergyTransferStations.Combined.Controls.WatersideEconomizer\">
-Buildings.Experimental.DHC.EnergyTransferStations.Combined.Controls.WatersideEconomizer</a>.
+<a href=\"modelica://Buildings.DHC.ETS.Combined.Controls.WatersideEconomizer\">
+Buildings.DHC.ETS.Combined.Controls.WatersideEconomizer</a>.
 </p>
 <p>
 The predicted heat exchanger approach is computed as
diff --git a/Buildings/Experimental/DHC/EnergyTransferStations/Combined/Controls/PrimaryVariableFlow.mo b/Buildings/DHC/ETS/Combined/Controls/PrimaryVariableFlow.mo
similarity index 97%
rename from Buildings/Experimental/DHC/EnergyTransferStations/Combined/Controls/PrimaryVariableFlow.mo
rename to Buildings/DHC/ETS/Combined/Controls/PrimaryVariableFlow.mo
index 913a88705d3..de689ec580b 100644
--- a/Buildings/Experimental/DHC/EnergyTransferStations/Combined/Controls/PrimaryVariableFlow.mo
+++ b/Buildings/DHC/ETS/Combined/Controls/PrimaryVariableFlow.mo
@@ -1,4 +1,4 @@
-within Buildings.Experimental.DHC.EnergyTransferStations.Combined.Controls;
+within Buildings.DHC.ETS.Combined.Controls;
 block PrimaryVariableFlow
   "Ideal control of condenser or evaporator variable flow rate"
   extends Modelica.Blocks.Icons.Block;
diff --git a/Buildings/Experimental/DHC/EnergyTransferStations/Combined/Controls/Reset.mo b/Buildings/DHC/ETS/Combined/Controls/Reset.mo
similarity index 97%
rename from Buildings/Experimental/DHC/EnergyTransferStations/Combined/Controls/Reset.mo
rename to Buildings/DHC/ETS/Combined/Controls/Reset.mo
index 086b397a0d3..9e6425f9d7b 100644
--- a/Buildings/Experimental/DHC/EnergyTransferStations/Combined/Controls/Reset.mo
+++ b/Buildings/DHC/ETS/Combined/Controls/Reset.mo
@@ -1,4 +1,4 @@
-within Buildings.Experimental.DHC.EnergyTransferStations.Combined.Controls;
+within Buildings.DHC.ETS.Combined.Controls;
 model Reset
   "Supervisory supply temperature reset"
   extends Modelica.Blocks.Icons.Block;
diff --git a/Buildings/Experimental/DHC/EnergyTransferStations/Combined/Controls/SideCold.mo b/Buildings/DHC/ETS/Combined/Controls/SideCold.mo
similarity index 97%
rename from Buildings/Experimental/DHC/EnergyTransferStations/Combined/Controls/SideCold.mo
rename to Buildings/DHC/ETS/Combined/Controls/SideCold.mo
index a87f673ab1d..cd00497262c 100644
--- a/Buildings/Experimental/DHC/EnergyTransferStations/Combined/Controls/SideCold.mo
+++ b/Buildings/DHC/ETS/Combined/Controls/SideCold.mo
@@ -1,4 +1,4 @@
-within Buildings.Experimental.DHC.EnergyTransferStations.Combined.Controls;
+within Buildings.DHC.ETS.Combined.Controls;
 model SideCold
   "Control block for cold side"
   extends Modelica.Blocks.Icons.Block;
@@ -202,8 +202,8 @@ First implementation.
       info="<html>
 <p>
 This block serves as the controller for the cold side of the ETS in
-<a href=\"modelica://Buildings.Experimental.DHC.EnergyTransferStations.Combined.Controls.Supervisory\">
-Buildings.Experimental.DHC.EnergyTransferStations.Combined.Controls.Supervisory</a>.
+<a href=\"modelica://Buildings.DHC.ETS.Combined.Controls.Supervisory\">
+Buildings.DHC.ETS.Combined.Controls.Supervisory</a>.
 It computes the following control signals.
 </p>
 <ul>
diff --git a/Buildings/Experimental/DHC/EnergyTransferStations/Combined/Controls/SideHot.mo b/Buildings/DHC/ETS/Combined/Controls/SideHot.mo
similarity index 96%
rename from Buildings/Experimental/DHC/EnergyTransferStations/Combined/Controls/SideHot.mo
rename to Buildings/DHC/ETS/Combined/Controls/SideHot.mo
index 50b09c42f3d..027efc2971a 100644
--- a/Buildings/Experimental/DHC/EnergyTransferStations/Combined/Controls/SideHot.mo
+++ b/Buildings/DHC/ETS/Combined/Controls/SideHot.mo
@@ -1,4 +1,4 @@
-within Buildings.Experimental.DHC.EnergyTransferStations.Combined.Controls;
+within Buildings.DHC.ETS.Combined.Controls;
 block SideHot
   "Control block for hot side"
   extends Modelica.Blocks.Icons.Block;
@@ -206,8 +206,8 @@ First implementation.
       info="<html>
 <p>
 This block serves as the controller for the hot side of the ETS in
-<a href=\"modelica://Buildings.Experimental.DHC.EnergyTransferStations.Combined.Controls.Supervisory\">
-Buildings.Experimental.DHC.EnergyTransferStations.Combined.Controls.Supervisory</a>.
+<a href=\"modelica://Buildings.DHC.ETS.Combined.Controls.Supervisory\">
+Buildings.DHC.ETS.Combined.Controls.Supervisory</a>.
 It computes the following control signals.
 </p>
 <ul>
@@ -250,8 +250,8 @@ When enabled, the controller maintains the temperature at the top of the
 heating water tank at the heating water supply temperature set point.
 The controller yields a signal between <code>0</code> and <code>nSouAmb+1</code>
 which is connected to
-<a href=\"modelica://Buildings.Experimental.DHC.EnergyTransferStations.Combined.Controls.SideCold\">
-Buildings.Experimental.DHC.EnergyTransferStations.Combined.Controls.SideCold</a>
+<a href=\"modelica://Buildings.DHC.ETS.Combined.Controls.SideCold\">
+Buildings.DHC.ETS.Combined.Controls.SideCold</a>
 where it is used to control in sequence the systems serving as ambient sources
 and ultimately to reset down the chilled water supply temperature.
 </li>
diff --git a/Buildings/Experimental/DHC/EnergyTransferStations/Combined/Controls/Supervisory.mo b/Buildings/DHC/ETS/Combined/Controls/Supervisory.mo
similarity index 86%
rename from Buildings/Experimental/DHC/EnergyTransferStations/Combined/Controls/Supervisory.mo
rename to Buildings/DHC/ETS/Combined/Controls/Supervisory.mo
index dad98a8f770..db5e916bf61 100644
--- a/Buildings/Experimental/DHC/EnergyTransferStations/Combined/Controls/Supervisory.mo
+++ b/Buildings/DHC/ETS/Combined/Controls/Supervisory.mo
@@ -1,7 +1,7 @@
-within Buildings.Experimental.DHC.EnergyTransferStations.Combined.Controls;
+within Buildings.DHC.ETS.Combined.Controls;
 model Supervisory
   "Supervisory controller"
-  extends Buildings.Experimental.DHC.EnergyTransferStations.Combined.Controls.BaseClasses.PartialSupervisory;
+  extends Buildings.DHC.ETS.Combined.Controls.BaseClasses.PartialSupervisory;
   parameter Buildings.Controls.OBC.CDL.Types.SimpleController
     controllerType=Buildings.Controls.OBC.CDL.Types.SimpleController.PI
     "Type of controller"
@@ -119,8 +119,8 @@ First implementation.
       info="<html>
 <p>
 This block implements the supervisory control functions of the ETS model
-<a href=\"modelica://Buildings.Experimental.DHC.EnergyTransferStations.Combined.ChillerBorefield\">
-Buildings.Experimental.DHC.EnergyTransferStations.Combined.ChillerBorefield</a>.
+<a href=\"modelica://Buildings.DHC.ETS.Combined.ChillerBorefield\">
+Buildings.DHC.ETS.Combined.ChillerBorefield</a>.
 </p>
 <ul>
 <li>
@@ -138,12 +138,12 @@ case the system performance is improved due to a lower chiller lift.
 </li>
 <li>
 The controller resets the heating water supply temperature based on the logic described in
-<a href=\"modelica://Buildings.Experimental.DHC.EnergyTransferStations.Combined.Controls.Reset\">
-Buildings.Experimental.DHC.EnergyTransferStations.Combined.Controls.Reset</a>.
+<a href=\"modelica://Buildings.DHC.ETS.Combined.Controls.Reset\">
+Buildings.DHC.ETS.Combined.Controls.Reset</a>.
 Note that this resetting logic is meant to operate the chiller at low lift.
 The chilled water supply temperature may be also reset down by
-<a href=\"modelica://Buildings.Experimental.DHC.EnergyTransferStations.Combined.Controls.SideCold\">
-Buildings.Experimental.DHC.EnergyTransferStations.Combined.Controls.SideCold</a>
+<a href=\"modelica://Buildings.DHC.ETS.Combined.Controls.SideCold\">
+Buildings.DHC.ETS.Combined.Controls.SideCold</a>
 to maintain the heating water supply temperature set point.
 This second resetting logic is required for the heating function of the unit,
 but it has a negative impact on the lift.
@@ -151,11 +151,11 @@ but it has a negative impact on the lift.
 <li>
 Eventually the systems serving as ambient sources are controlled based on the
 maximum of the control signals <code>yAmb</code> yielded by
-<a href=\"modelica://Buildings.Experimental.DHC.EnergyTransferStations.Combined.Controls.SideHot\">
-Buildings.Experimental.DHC.EnergyTransferStations.Combined.Controls.SideHot</a>
+<a href=\"modelica://Buildings.DHC.ETS.Combined.Controls.SideHot\">
+Buildings.DHC.ETS.Combined.Controls.SideHot</a>
 and
-<a href=\"modelica://Buildings.Experimental.DHC.EnergyTransferStations.Combined.Controls.SideCold\">
-Buildings.Experimental.DHC.EnergyTransferStations.Combined.Controls.SideCold</a>.
+<a href=\"modelica://Buildings.DHC.ETS.Combined.Controls.SideCold\">
+Buildings.DHC.ETS.Combined.Controls.SideCold</a>.
 </li>
 </ul>
 </html>"));
diff --git a/Buildings/Experimental/DHC/EnergyTransferStations/Combined/Controls/SwitchBox.mo b/Buildings/DHC/ETS/Combined/Controls/SwitchBox.mo
similarity index 90%
rename from Buildings/Experimental/DHC/EnergyTransferStations/Combined/Controls/SwitchBox.mo
rename to Buildings/DHC/ETS/Combined/Controls/SwitchBox.mo
index 9eaec83cc57..98be9bb629e 100644
--- a/Buildings/Experimental/DHC/EnergyTransferStations/Combined/Controls/SwitchBox.mo
+++ b/Buildings/DHC/ETS/Combined/Controls/SwitchBox.mo
@@ -1,4 +1,4 @@
-within Buildings.Experimental.DHC.EnergyTransferStations.Combined.Controls;
+within Buildings.DHC.ETS.Combined.Controls;
 block SwitchBox "Controller for flow switch box"
   extends Modelica.Blocks.Icons.Block;
   parameter Modelica.Units.SI.MassFlowRate m_flow_nominal
@@ -62,8 +62,8 @@ equation
 <p>
 This block implements a control logic preventing flow reversal in the
 service line, for instance with the hydronic configuration of
-<a href=\"modelica://Buildings.Experimental.DHC.EnergyTransferStations.Combined.HeatPumpHeatExchanger\">
-Buildings.Experimental.DHC.EnergyTransferStations.Combined.HeatPumpHeatExchanger</a>.
+<a href=\"modelica://Buildings.DHC.ETS.Combined.HeatPumpHeatExchanger\">
+Buildings.DHC.ETS.Combined.HeatPumpHeatExchanger</a>.
 The block requires two input signals representing the mass flow rate contributing
 to a positive flow direction <code>mPos_flow</code> and the mass flow contributing
 to a reverse flow direction <code>mRev_flow</code>.
@@ -71,8 +71,8 @@ The output signal <code>y</code> switches to maintain <code>mPos_flow ≥ mRev_f
 with a temporization avoiding short cycling.
 Due to the temporization, the mass flow rate may transiently change direction as
 illustrated in
-<a href=\"modelica://Buildings.Experimental.DHC.EnergyTransferStations.Combined.Subsystems.Validation.SwitchBox\">
-Buildings.Experimental.DHC.EnergyTransferStations.Combined.Subsystems.Validation.SwitchBox</a>.
+<a href=\"modelica://Buildings.DHC.ETS.Combined.Subsystems.Validation.SwitchBox\">
+Buildings.DHC.ETS.Combined.Subsystems.Validation.SwitchBox</a>.
 </p>
 </html>", revisions="<html>
 <ul>
diff --git a/Buildings/Experimental/DHC/EnergyTransferStations/Combined/Controls/WatersideEconomizer.mo b/Buildings/DHC/ETS/Combined/Controls/WatersideEconomizer.mo
similarity index 99%
rename from Buildings/Experimental/DHC/EnergyTransferStations/Combined/Controls/WatersideEconomizer.mo
rename to Buildings/DHC/ETS/Combined/Controls/WatersideEconomizer.mo
index 448fd2b3ed9..08f48eedd1c 100644
--- a/Buildings/Experimental/DHC/EnergyTransferStations/Combined/Controls/WatersideEconomizer.mo
+++ b/Buildings/DHC/ETS/Combined/Controls/WatersideEconomizer.mo
@@ -1,4 +1,4 @@
-within Buildings.Experimental.DHC.EnergyTransferStations.Combined.Controls;
+within Buildings.DHC.ETS.Combined.Controls;
 model WatersideEconomizer
   "Waterside economizer controller"
   extends Modelica.Blocks.Icons.Block;
diff --git a/Buildings/Experimental/DHC/EnergyTransferStations/Combined/Controls/package.mo b/Buildings/DHC/ETS/Combined/Controls/package.mo
similarity index 84%
rename from Buildings/Experimental/DHC/EnergyTransferStations/Combined/Controls/package.mo
rename to Buildings/DHC/ETS/Combined/Controls/package.mo
index a44204faccb..475537ca087 100644
--- a/Buildings/Experimental/DHC/EnergyTransferStations/Combined/Controls/package.mo
+++ b/Buildings/DHC/ETS/Combined/Controls/package.mo
@@ -1,4 +1,4 @@
-within Buildings.Experimental.DHC.EnergyTransferStations.Combined;
+within Buildings.DHC.ETS.Combined;
 package Controls "Package of control blocks for fifth generation DHC ETS"
   extends Modelica.Icons.VariantsPackage;
 
diff --git a/Buildings/Experimental/DHC/EnergyTransferStations/Combined/Controls/package.order b/Buildings/DHC/ETS/Combined/Controls/package.order
similarity index 100%
rename from Buildings/Experimental/DHC/EnergyTransferStations/Combined/Controls/package.order
rename to Buildings/DHC/ETS/Combined/Controls/package.order
diff --git a/Buildings/Experimental/DHC/EnergyTransferStations/Combined/Examples/ChillerBorefield.mo b/Buildings/DHC/ETS/Combined/Examples/ChillerBorefield.mo
similarity index 63%
rename from Buildings/Experimental/DHC/EnergyTransferStations/Combined/Examples/ChillerBorefield.mo
rename to Buildings/DHC/ETS/Combined/Examples/ChillerBorefield.mo
index 2d593e9c134..269a84272e3 100644
--- a/Buildings/Experimental/DHC/EnergyTransferStations/Combined/Examples/ChillerBorefield.mo
+++ b/Buildings/DHC/ETS/Combined/Examples/ChillerBorefield.mo
@@ -1,4 +1,4 @@
-within Buildings.Experimental.DHC.EnergyTransferStations.Combined.Examples;
+within Buildings.DHC.ETS.Combined.Examples;
 model ChillerBorefield
   "Example of the ETS model with heat recovery chiller and borefield"
   extends ChillerOnly(
@@ -10,7 +10,7 @@ model ChillerBorefield
   parameter Modelica.Units.SI.Distance dxy=6
     "Distance in x-axis (and y-axis) between borehole axes";
   final parameter Modelica.Units.SI.Distance cooBor[nBorHol,2]=
-    Buildings.Experimental.DHC.EnergyTransferStations.BaseClasses.computeCoordinates(nBorHol, dxy)
+    Buildings.DHC.ETS.BaseClasses.computeCoordinates(nBorHol, dxy)
     "Coordinates of boreholes";
   parameter Fluid.Geothermal.Borefields.Data.Borefield.Example datBorFie(
     conDat=Fluid.Geothermal.Borefields.Data.Configuration.Example(
@@ -20,7 +20,7 @@ model ChillerBorefield
     annotation (Placement(transformation(extent={{60,180},{80,200}})));
   annotation (
     __Dymola_Commands(
-      file="modelica://Buildings/Resources/Scripts/Dymola/Experimental/DHC/EnergyTransferStations/Combined/Examples/ChillerBorefield.mos" "Simulate and plot"),
+      file="modelica://Buildings/Resources/Scripts/Dymola/DHC/ETS/Combined/Examples/ChillerBorefield.mos" "Simulate and plot"),
     experiment(
       StartTime=6.5E6,
       StopTime=7E6,
@@ -37,12 +37,12 @@ First implementation.
       info="<html>
 <p>
 This model validates
-<a href=\"modelica://Buildings.Experimental.DHC.EnergyTransferStations.Combined.ChillerBorefield\">
-Buildings.Experimental.DHC.EnergyTransferStations.Combined.ChillerBorefield</a>
+<a href=\"modelica://Buildings.DHC.ETS.Combined.ChillerBorefield\">
+Buildings.DHC.ETS.Combined.ChillerBorefield</a>
 in a system configuration including a geothermal borefield.
 See
-<a href=\"modelica://Buildings.Experimental.DHC.EnergyTransferStations.Combined.Examples.ChillerOnly\">
-Buildings.Experimental.DHC.EnergyTransferStations.Combined.Examples.ChillerOnly</a>
+<a href=\"modelica://Buildings.DHC.ETS.Combined.Examples.ChillerOnly\">
+Buildings.DHC.ETS.Combined.Examples.ChillerOnly</a>
 for the description of the main modeling assumptions.
 </p>
 </html>"));
diff --git a/Buildings/Experimental/DHC/EnergyTransferStations/Combined/Examples/ChillerOnly.mo b/Buildings/DHC/ETS/Combined/Examples/ChillerOnly.mo
similarity index 70%
rename from Buildings/Experimental/DHC/EnergyTransferStations/Combined/Examples/ChillerOnly.mo
rename to Buildings/DHC/ETS/Combined/Examples/ChillerOnly.mo
index 94d500cbd59..e0f4821484f 100644
--- a/Buildings/Experimental/DHC/EnergyTransferStations/Combined/Examples/ChillerOnly.mo
+++ b/Buildings/DHC/ETS/Combined/Examples/ChillerOnly.mo
@@ -1,7 +1,7 @@
-within Buildings.Experimental.DHC.EnergyTransferStations.Combined.Examples;
+within Buildings.DHC.ETS.Combined.Examples;
 model ChillerOnly
   "Example of the ETS model with heat recovery chiller"
-  extends Buildings.Experimental.DHC.EnergyTransferStations.Combined.Validation.BaseClasses.PartialChillerBorefield(
+  extends Buildings.DHC.ETS.Combined.Validation.BaseClasses.PartialChillerBorefield(
     TDisWatSup(
       table=[
         0,11;
@@ -23,13 +23,13 @@ model ChillerOnly
       fileName=Modelica.Utilities.Files.loadResource(
         filNam),
       timeScale=1),
-    QCoo_flow_nominal=Buildings.Experimental.DHC.Loads.BaseClasses.getPeakLoad(
+    QCoo_flow_nominal=Buildings.DHC.Loads.BaseClasses.getPeakLoad(
       string="#Peak space cooling load",
       filNam=Modelica.Utilities.Files.loadResource(filNam)),
-    QHea_flow_nominal=Buildings.Experimental.DHC.Loads.BaseClasses.getPeakLoad(
+    QHea_flow_nominal=Buildings.DHC.Loads.BaseClasses.getPeakLoad(
       string="#Peak space heating load",
       filNam=Modelica.Utilities.Files.loadResource(filNam)));
-  parameter String filNam="modelica://Buildings/Resources/Data/Experimental/DHC/Loads/Examples/MediumOffice-90.1-2010-5A.mos"
+  parameter String filNam="modelica://Buildings/Resources/Data/DHC/Loads/Examples/MediumOffice-90.1-2010-5A.mos"
     "File name with thermal loads as time series";
   Buildings.Controls.OBC.CDL.Reals.MultiplyByParameter loaNorHea(
     final k=1/ets.QHeaWat_flow_nominal)
@@ -57,7 +57,7 @@ equation
     annotation (Line(points={{-309,-140},{-140,-140},{-140,-136},{-122,-136}},color={0,0,127}));
   annotation (
     __Dymola_Commands(
-      file="modelica://Buildings/Resources/Scripts/Dymola/Experimental/DHC/EnergyTransferStations/Combined/Examples/ChillerOnly.mos" "Simulate and plot"),
+      file="modelica://Buildings/Resources/Scripts/Dymola/DHC/ETS/Combined/Examples/ChillerOnly.mos" "Simulate and plot"),
     experiment(
       StartTime=6.5E6,
       StopTime=7E6,
@@ -74,8 +74,8 @@ First implementation.
       info="<html>
 <p>
 This model validates
-<a href=\"modelica://Buildings.Experimental.DHC.EnergyTransferStations.Combined.ChillerBorefield\">
-Buildings.Experimental.DHC.EnergyTransferStations.Combined.ChillerBorefield</a>
+<a href=\"modelica://Buildings.DHC.ETS.Combined.ChillerBorefield\">
+Buildings.DHC.ETS.Combined.ChillerBorefield</a>
 in a system configuration with no geothermal borefield.
 </p>
 <ul>
@@ -89,8 +89,8 @@ a minimum in January and a maximum in August.
 </li>
 <li>
 The other modeling assumptions are described in
-<a href=\"modelica://Buildings.Experimental.DHC.EnergyTransferStations.Combined.Validation.BaseClasses.PartialChillerBorefield\">
-Buildings.Experimental.DHC.EnergyTransferStations.Combined.Validation.BaseClasses.PartialChillerBorefield</a>.
+<a href=\"modelica://Buildings.DHC.ETS.Combined.Validation.BaseClasses.PartialChillerBorefield\">
+Buildings.DHC.ETS.Combined.Validation.BaseClasses.PartialChillerBorefield</a>.
 </li>
 </ul>
 </html>"));
diff --git a/Buildings/Experimental/DHC/Loads/BaseClasses/Examples/package.mo b/Buildings/DHC/ETS/Combined/Examples/package.mo
similarity index 67%
rename from Buildings/Experimental/DHC/Loads/BaseClasses/Examples/package.mo
rename to Buildings/DHC/ETS/Combined/Examples/package.mo
index ba9fe6c02be..e34a35a5a13 100644
--- a/Buildings/Experimental/DHC/Loads/BaseClasses/Examples/package.mo
+++ b/Buildings/DHC/ETS/Combined/Examples/package.mo
@@ -1,4 +1,4 @@
-within Buildings.Experimental.DHC.Loads.BaseClasses;
+within Buildings.DHC.ETS.Combined;
 package Examples "Example models integrating multiple components"
   extends Modelica.Icons.ExamplesPackage;
 
@@ -8,8 +8,8 @@ package Examples "Example models integrating multiple components"
       info="<html>
 <p>
 This package contains advanced examples illustrating the use of the models in
-<a href=\"modelica://Buildings.Experimental.DHC.Loads\">
-Buildings.Experimental.DHC.Loads</a>.
+<a href=\"modelica://Buildings.DHC.ETS.Combined\">
+Buildings.DHC.ETS.Combined</a>.
 </p>
 </html>"));
 end Examples;
diff --git a/Buildings/Experimental/DHC/EnergyTransferStations/Combined/Examples/package.order b/Buildings/DHC/ETS/Combined/Examples/package.order
similarity index 100%
rename from Buildings/Experimental/DHC/EnergyTransferStations/Combined/Examples/package.order
rename to Buildings/DHC/ETS/Combined/Examples/package.order
diff --git a/Buildings/Experimental/DHC/EnergyTransferStations/Combined/HeatPumpHeatExchanger.mo b/Buildings/DHC/ETS/Combined/HeatPumpHeatExchanger.mo
similarity index 95%
rename from Buildings/Experimental/DHC/EnergyTransferStations/Combined/HeatPumpHeatExchanger.mo
rename to Buildings/DHC/ETS/Combined/HeatPumpHeatExchanger.mo
index a0ba2593c1b..775816b8516 100644
--- a/Buildings/Experimental/DHC/EnergyTransferStations/Combined/HeatPumpHeatExchanger.mo
+++ b/Buildings/DHC/ETS/Combined/HeatPumpHeatExchanger.mo
@@ -1,11 +1,11 @@
-within Buildings.Experimental.DHC.EnergyTransferStations.Combined;
+within Buildings.DHC.ETS.Combined;
 model HeatPumpHeatExchanger
   "Model of a substation with heat pump for heating, heat pump for domestic hot water, and compressor-less cooling"
   extends
-    Buildings.Experimental.DHC.EnergyTransferStations.Combined.BaseClasses.PartialHeatPumpHeatExchanger(
+    Buildings.DHC.ETS.Combined.BaseClasses.PartialHeatPumpHeatExchanger(
       volMix_a(nPorts=4),
       volMix_b(nPorts=4));
-  Buildings.Experimental.DHC.EnergyTransferStations.Combined.Subsystems.HeatPump proHotWat(
+  Buildings.DHC.ETS.Combined.Subsystems.HeatPump proHotWat(
     redeclare final package Medium1 = MediumBui,
     redeclare final package Medium2 = MediumSer,
     final COP_nominal=COPHotWat_nominal,
@@ -89,8 +89,8 @@ equation
   Documentation(info="<html>
 <p>
 This model uses the base energy transfer station defined in
-<a href=\"modelica://Buildings.Experimental.DHC.EnergyTransferStations.Combined.BaseClasses.PartialHeatPumpHeatExchanger\">
-Buildings.Experimental.DHC.EnergyTransferStations.Combined.BaseClasses.PartialHeatPumpHeatExchanger</a>.
+<a href=\"modelica://Buildings.DHC.ETS.Combined.BaseClasses.PartialHeatPumpHeatExchanger\">
+Buildings.DHC.ETS.Combined.BaseClasses.PartialHeatPumpHeatExchanger</a>.
 </p>
 <h4>Domestic Hot Water</h4>
 <p>
@@ -113,8 +113,8 @@ When enabled,
 <li>
 The heat pump and the evaporator and condenser hydronics are controlled
 based on the principles described in
-<a href=\"modelica://Buildings.Experimental.DHC.EnergyTransferStations.Combined.Subsystems.HeatPump\">
-Buildings.Experimental.DHC.EnergyTransferStations.Combined.Subsystems.HeatPump</a>.
+<a href=\"modelica://Buildings.DHC.ETS.Combined.Subsystems.HeatPump\">
+Buildings.DHC.ETS.Combined.Subsystems.HeatPump</a>.
 </li>
 <li>
 The condensor water mass flow rate is computed based on the domestic hot water
diff --git a/Buildings/Experimental/DHC/EnergyTransferStations/Combined/HeatPumpHeatExchangerDHWTank.mo b/Buildings/DHC/ETS/Combined/HeatPumpHeatExchangerDHWTank.mo
similarity index 94%
rename from Buildings/Experimental/DHC/EnergyTransferStations/Combined/HeatPumpHeatExchangerDHWTank.mo
rename to Buildings/DHC/ETS/Combined/HeatPumpHeatExchangerDHWTank.mo
index 7187305328b..4cddedd3774 100644
--- a/Buildings/Experimental/DHC/EnergyTransferStations/Combined/HeatPumpHeatExchangerDHWTank.mo
+++ b/Buildings/DHC/ETS/Combined/HeatPumpHeatExchangerDHWTank.mo
@@ -1,8 +1,8 @@
-within Buildings.Experimental.DHC.EnergyTransferStations.Combined;
+within Buildings.DHC.ETS.Combined;
 model HeatPumpHeatExchangerDHWTank
   "Model of a substation with heat pump for heating, heat pump with storage tank for domestic hot water, and compressor-less cooling"
   extends
-    Buildings.Experimental.DHC.EnergyTransferStations.Combined.BaseClasses.PartialHeatPumpHeatExchanger(
+    Buildings.DHC.ETS.Combined.BaseClasses.PartialHeatPumpHeatExchanger(
     volMix_b(nPorts=4),
     volMix_a(nPorts=4));
   Buildings.Fluid.Sources.Boundary_pT souDCW(
@@ -14,7 +14,7 @@ model HeatPumpHeatExchangerDHWTank
       extent={{10,-10},{-10,10}},
       rotation=180,
       origin={-52,-56})));
-  Buildings.Experimental.DHC.EnergyTransferStations.Combined.Subsystems.HeatPumpDHWTank proHotWat(
+  Buildings.DHC.ETS.Combined.Subsystems.HeatPumpDHWTank proHotWat(
     redeclare final package Medium1 = MediumBui,
     redeclare final package Medium2 = MediumSer,
     final COP_nominal=COPHotWat_nominal,
@@ -29,16 +29,16 @@ model HeatPumpHeatExchangerDHWTank
     datWatHea=datWatHea) if have_hotWat
     "Subsystem for hot water production"
     annotation (Placement(transformation(extent={{30,24},{50,44}})));
-  parameter Buildings.Experimental.DHC.Loads.HotWater.Data.GenericDomesticHotWaterWithHeatExchanger
+  parameter Buildings.DHC.Loads.HotWater.Data.GenericDomesticHotWaterWithHeatExchanger
     datWatHea "Performance data"
     annotation (Placement(transformation(extent={{36,48},{48,60}})));
-  Buildings.Experimental.DHC.Loads.HotWater.ThermostaticMixingValve theMixVal(
+  Buildings.DHC.Loads.HotWater.ThermostaticMixingValve theMixVal(
     redeclare package Medium = MediumBui,
     mMix_flow_nominal=QHotWat_flow_nominal/cpBui_default/(THotWatSup_nominal - TColWat_nominal))
      if have_hotWat
      "Thermostatic mixing valve"
     annotation (Placement(transformation(extent={{-20,50},{-40,72}})));
-  Buildings.Experimental.DHC.EnergyTransferStations.BaseClasses.Junction dcwSpl(
+  Buildings.DHC.ETS.BaseClasses.Junction dcwSpl(
       redeclare final package Medium = MediumBui, final m_flow_nominal=
         datWatHea.mDom_flow_nominal*{1,-1,-1})
                                              "Splitter for domestic cold water"
@@ -95,8 +95,8 @@ equation
   Documentation(info="<html>
 <p>
 This model uses the base energy transfer station defined in
-<a href=\"modelica://Buildings.Experimental.DHC.EnergyTransferStations.Combined.BaseClasses.PartialHeatPumpHeatExchanger\">
-Buildings.Experimental.DHC.EnergyTransferStations.Combined.BaseClasses.PartialHeatPumpHeatExchanger</a>.
+<a href=\"modelica://Buildings.DHC.ETS.Combined.BaseClasses.PartialHeatPumpHeatExchanger\">
+Buildings.DHC.ETS.Combined.BaseClasses.PartialHeatPumpHeatExchanger</a>.
 </p>
 <h4>Domestic Hot Water</h4>
 <p>
@@ -119,8 +119,8 @@ When enabled,
 <li>
 The heat pump and the evaporator and condenser hydronics are controlled
 based on the principles described in
-<a href=\"modelica://Buildings.Experimental.DHC.EnergyTransferStations.Combined.Subsystems.HeatPumpDHWTank\">
-Buildings.Experimental.DHC.EnergyTransferStations.Combined.Subsystems.HeatPumpDHWTank</a>.
+<a href=\"modelica://Buildings.DHC.ETS.Combined.Subsystems.HeatPumpDHWTank\">
+Buildings.DHC.ETS.Combined.Subsystems.HeatPumpDHWTank</a>.
 </li>
 <li>
 The mass flow rate of water leaving the domestic hot water heat exchanger is computed based on the domestic hot water
diff --git a/Buildings/Experimental/DHC/EnergyTransferStations/Combined/Subsystems/BaseClasses/PartialHeatPump.mo b/Buildings/DHC/ETS/Combined/Subsystems/BaseClasses/PartialHeatPump.mo
similarity index 98%
rename from Buildings/Experimental/DHC/EnergyTransferStations/Combined/Subsystems/BaseClasses/PartialHeatPump.mo
rename to Buildings/DHC/ETS/Combined/Subsystems/BaseClasses/PartialHeatPump.mo
index ec3c4026f43..640992f133c 100644
--- a/Buildings/Experimental/DHC/EnergyTransferStations/Combined/Subsystems/BaseClasses/PartialHeatPump.mo
+++ b/Buildings/DHC/ETS/Combined/Subsystems/BaseClasses/PartialHeatPump.mo
@@ -1,4 +1,4 @@
-within Buildings.Experimental.DHC.EnergyTransferStations.Combined.Subsystems.BaseClasses;
+within Buildings.DHC.ETS.Combined.Subsystems.BaseClasses;
 model PartialHeatPump
   "Partial base class for subsystems containing a heat pump"
   replaceable package Medium1=Modelica.Media.Interfaces.PartialMedium
@@ -104,7 +104,7 @@ model PartialHeatPump
     energyDynamics=Modelica.Fluid.Types.Dynamics.FixedInitial)
     "Domestic hot water heat pump"
     annotation (Placement(transformation(extent={{-80,-82},{-60,-62}})));
-  Buildings.Experimental.DHC.EnergyTransferStations.BaseClasses.Pump_m_flow
+  Buildings.DHC.ETS.BaseClasses.Pump_m_flow
                                      pumCon(
     energyDynamics=Modelica.Fluid.Types.Dynamics.FixedInitial,
     redeclare package Medium = Medium2,
@@ -176,7 +176,7 @@ model PartialHeatPump
     annotation (
       Placement(transformation(extent={{-240,100},{-200,140}}),
         iconTransformation(extent={{-140,70},{-100,110}})));
-  Buildings.Experimental.DHC.EnergyTransferStations.BaseClasses.Junction
+  Buildings.DHC.ETS.BaseClasses.Junction
     junction(redeclare package Medium = Medium2, m_flow_nominal={
         mEva_flow_nominal,-mEva_flow_nominal,mEva_flow_nominal})
     annotation (Placement(transformation(extent={{-130,-90},{-150,-70}})));
diff --git a/Buildings/Experimental/DHC/EnergyTransferStations/Combined/Subsystems/BaseClasses/package.mo b/Buildings/DHC/ETS/Combined/Subsystems/BaseClasses/package.mo
similarity index 50%
rename from Buildings/Experimental/DHC/EnergyTransferStations/Combined/Subsystems/BaseClasses/package.mo
rename to Buildings/DHC/ETS/Combined/Subsystems/BaseClasses/package.mo
index d0cac58d742..63aa6d2605f 100644
--- a/Buildings/Experimental/DHC/EnergyTransferStations/Combined/Subsystems/BaseClasses/package.mo
+++ b/Buildings/DHC/ETS/Combined/Subsystems/BaseClasses/package.mo
@@ -1,4 +1,4 @@
-within Buildings.Experimental.DHC.EnergyTransferStations.Combined.Subsystems;
+within Buildings.DHC.ETS.Combined.Subsystems;
 package BaseClasses "Contains base classes for Subsystems"
   extends Modelica.Icons.BasesPackage;
   annotation (
@@ -6,8 +6,8 @@ package BaseClasses "Contains base classes for Subsystems"
       info="<html>
 <p>
 This package contains base class models for the classes in
-<a href=\"modelica://Buildings.Experimental.DHC.EnergyTransferStations.Combined.Subsystems\">
-Buildings.Experimental.DHC.EnergyTransferStations.Combined.Subsystems</a>.
+<a href=\"modelica://Buildings.DHC.ETS.Combined.Subsystems\">
+Buildings.DHC.ETS.Combined.Subsystems</a>.
 </p>
 </html>"));
 end BaseClasses;
diff --git a/Buildings/Experimental/DHC/EnergyTransferStations/Combined/Subsystems/BaseClasses/package.order b/Buildings/DHC/ETS/Combined/Subsystems/BaseClasses/package.order
similarity index 100%
rename from Buildings/Experimental/DHC/EnergyTransferStations/Combined/Subsystems/BaseClasses/package.order
rename to Buildings/DHC/ETS/Combined/Subsystems/BaseClasses/package.order
diff --git a/Buildings/Experimental/DHC/EnergyTransferStations/Combined/Subsystems/Borefield.mo b/Buildings/DHC/ETS/Combined/Subsystems/Borefield.mo
similarity index 94%
rename from Buildings/Experimental/DHC/EnergyTransferStations/Combined/Subsystems/Borefield.mo
rename to Buildings/DHC/ETS/Combined/Subsystems/Borefield.mo
index 4c9ec63e1cb..a48efdfe462 100644
--- a/Buildings/Experimental/DHC/EnergyTransferStations/Combined/Subsystems/Borefield.mo
+++ b/Buildings/DHC/ETS/Combined/Subsystems/Borefield.mo
@@ -1,9 +1,9 @@
-within Buildings.Experimental.DHC.EnergyTransferStations.Combined.Subsystems;
+within Buildings.DHC.ETS.Combined.Subsystems;
 model Borefield
   "Base subsystem with geothermal borefield"
   extends Buildings.Fluid.Interfaces.PartialTwoPortInterface(
     final m_flow_nominal=datBorFie.conDat.mBorFie_flow_nominal);
-  replaceable model BoreFieldType=Fluid.Geothermal.Borefields.OneUTube
+  replaceable model BorefieldType=Fluid.Geothermal.Borefields.OneUTube
     constrainedby Fluid.Geothermal.Borefields.BaseClasses.PartialBorefield(
       redeclare package Medium=Medium,
       allowFlowReversal=allowFlowReversal,
@@ -49,7 +49,7 @@ model Borefield
       2))
     "Mixing valve controlling entering temperature"
     annotation (Placement(transformation(extent={{-10,-10},{10,10}},rotation=0,origin={-80,0})));
-  Buildings.Experimental.DHC.EnergyTransferStations.BaseClasses.Pump_m_flow pum(
+  Buildings.DHC.ETS.BaseClasses.Pump_m_flow pum(
     redeclare final package Medium=Medium,
     final m_flow_nominal=m_flow_nominal,
     final dp_nominal=dpValBorFie_nominal+dp_nominal)
@@ -66,10 +66,10 @@ model Borefield
     final m_flow_nominal=m_flow_nominal)
     "Entering temperature"
     annotation (Placement(transformation(extent={{-10,-10},{10,10}},rotation=0,origin={-10,0})));
-  BoreFieldType borFie
+  BorefieldType borFie
     "Geothermal borefield"
     annotation (Placement(transformation(extent={{-10,-10},{10,10}},rotation=0,origin={22,0})));
-  Buildings.Experimental.DHC.EnergyTransferStations.BaseClasses.Junction spl(
+  Buildings.DHC.ETS.BaseClasses.Junction spl(
     redeclare final package Medium=Medium,
     final m_flow_nominal=m_flow_nominal .* {1,-1,-1})
     "Flow splitter"
@@ -80,7 +80,7 @@ model Borefield
     final m_flow_nominal=m_flow_nominal)
     "Leaving temperature"
     annotation (Placement(transformation(extent={{-10,-10},{10,10}},rotation=0,origin={50,0})));
-  Buildings.Experimental.DHC.EnergyTransferStations.Combined.Controls.Borefield con(
+  Buildings.DHC.ETS.Combined.Controls.Borefield con(
     final TBorWatEntMax=TBorWatEntMax,
     final spePumBorMin=spePumBorMin)
     "Controller"
@@ -218,8 +218,8 @@ and a mixing valve modulated to maintain a maximum inlet temperature.
 </p>
 <p>
 The system is controlled based on the logic described in
-<a href=\"modelica://Buildings.Experimental.DHC.EnergyTransferStations.Combined.Controls.Borefield\">
-Buildings.Experimental.DHC.EnergyTransferStations.Combined.Controls.Borefield</a>.
+<a href=\"modelica://Buildings.DHC.ETS.Combined.Controls.Borefield\">
+Buildings.DHC.ETS.Combined.Controls.Borefield</a>.
 The pump flow rate is considered proportional to the pump speed
 under the assumption of a constant flow resistance in the borefield loop.
 This assumption is justified by the connection of the loop to the buffer tanks,
diff --git a/Buildings/Experimental/DHC/EnergyTransferStations/Combined/Subsystems/Chiller.mo b/Buildings/DHC/ETS/Combined/Subsystems/Chiller.mo
similarity index 96%
rename from Buildings/Experimental/DHC/EnergyTransferStations/Combined/Subsystems/Chiller.mo
rename to Buildings/DHC/ETS/Combined/Subsystems/Chiller.mo
index be4beec4c91..08db3f17039 100644
--- a/Buildings/Experimental/DHC/EnergyTransferStations/Combined/Subsystems/Chiller.mo
+++ b/Buildings/DHC/ETS/Combined/Subsystems/Chiller.mo
@@ -1,4 +1,4 @@
-within Buildings.Experimental.DHC.EnergyTransferStations.Combined.Subsystems;
+within Buildings.DHC.ETS.Combined.Subsystems;
 model Chiller
   "Base subsystem with heat recovery chiller"
   replaceable package Medium=Modelica.Media.Interfaces.PartialMedium
@@ -125,21 +125,21 @@ model Chiller
     final per=dat)
     "Water cooled chiller (ports indexed 1 are on condenser side)"
     annotation (Placement(transformation(extent={{-10,-10},{10,10}})));
-  Buildings.Experimental.DHC.EnergyTransferStations.BaseClasses.Pump_m_flow pumCon(
+  Buildings.DHC.ETS.BaseClasses.Pump_m_flow pumCon(
     redeclare final package Medium=Medium,
     final allowFlowReversal=allowFlowReversal,
     final m_flow_nominal=dat.mCon_flow_nominal,
     final dp_nominal=dpCon_nominal+dpValCon_nominal)
     "Condenser pump"
     annotation (Placement(transformation(extent={{-110,50},{-90,70}})));
-  Buildings.Experimental.DHC.EnergyTransferStations.BaseClasses.Pump_m_flow pumEva(
+  Buildings.DHC.ETS.BaseClasses.Pump_m_flow pumEva(
     redeclare final package Medium=Medium,
     final allowFlowReversal=allowFlowReversal,
     final m_flow_nominal=dat.mEva_flow_nominal,
     final dp_nominal=dpEva_nominal+dpValEva_nominal)
     "Evaporator pump"
     annotation (Placement(transformation(extent={{10,-10},{-10,10}},rotation=0,origin={-100,-60})));
-  Buildings.Experimental.DHC.EnergyTransferStations.Combined.Controls.Chiller con(
+  Buildings.DHC.ETS.Combined.Controls.Chiller con(
     final TConWatEntMin=TConWatEntMin,
     final TEvaWatEntMax=TEvaWatEntMax)
     "Controller"
@@ -168,12 +168,12 @@ model Chiller
     final m_flow_nominal=dat.mEva_flow_nominal)
     "Evaporator water leaving temperature"
     annotation (Placement(transformation(extent={{10,-10},{-10,10}},rotation=90,origin={-20,-20})));
-  Buildings.Experimental.DHC.EnergyTransferStations.BaseClasses.Junction splEva(
+  Buildings.DHC.ETS.BaseClasses.Junction splEva(
     redeclare final package Medium=Medium,
     final m_flow_nominal=dat.mEva_flow_nominal .* {1,-1,-1})
     "Flow splitter for the evaporator water circuit"
     annotation (Placement(transformation(extent={{10,-10},{-10,10}},rotation=0,origin={-140,-60})));
-  Buildings.Experimental.DHC.EnergyTransferStations.BaseClasses.Junction splConMix(
+  Buildings.DHC.ETS.BaseClasses.Junction splConMix(
     redeclare final package Medium=Medium,
     final m_flow_nominal=dat.mCon_flow_nominal .* {1,-1,-1})
     "Flow splitter"
@@ -437,8 +437,8 @@ condenser inlet temperature (resp. maximum evaporator inlet temperature).
 </p>
 <p>
 The system is controlled based on the logic described in
-<a href=\"modelica://Buildings.Experimental.DHC.EnergyTransferStations.Combined.Controls.Chiller\">
-Buildings.Experimental.DHC.EnergyTransferStations.Combined.Controls.Chiller</a>.
+<a href=\"modelica://Buildings.DHC.ETS.Combined.Controls.Chiller\">
+Buildings.DHC.ETS.Combined.Controls.Chiller</a>.
 The pump flow rate is considered proportional to the pump speed
 under the assumption of a constant flow resistance for both the condenser
 and the evaporator loops. This assumption is justified
diff --git a/Buildings/Experimental/DHC/EnergyTransferStations/Combined/Subsystems/HeatExchanger.mo b/Buildings/DHC/ETS/Combined/Subsystems/HeatExchanger.mo
similarity index 95%
rename from Buildings/Experimental/DHC/EnergyTransferStations/Combined/Subsystems/HeatExchanger.mo
rename to Buildings/DHC/ETS/Combined/Subsystems/HeatExchanger.mo
index bd81d0a794d..ac225f0e421 100644
--- a/Buildings/Experimental/DHC/EnergyTransferStations/Combined/Subsystems/HeatExchanger.mo
+++ b/Buildings/DHC/ETS/Combined/Subsystems/HeatExchanger.mo
@@ -1,10 +1,10 @@
-within Buildings.Experimental.DHC.EnergyTransferStations.Combined.Subsystems;
+within Buildings.DHC.ETS.Combined.Subsystems;
 model HeatExchanger
   "Base subsystem with district heat exchanger"
   extends Buildings.Fluid.Interfaces.PartialFourPortInterface(
     final m1_flow_nominal=abs(Q_flow_nominal/4200/(T_b1_nominal - T_a1_nominal)),
     final m2_flow_nominal=abs(Q_flow_nominal/4200/(T_b2_nominal - T_a2_nominal)));
-  parameter DHC.EnergyTransferStations.Types.ConnectionConfiguration conCon
+  parameter DHC.ETS.Types.ConnectionConfiguration conCon
     "District connection configuration" annotation (Evaluate=true);
   parameter Modelica.Units.SI.PressureDifference dp1Hex_nominal(displayUnit=
         "Pa") "Nominal pressure drop across heat exchanger on district side"
@@ -56,7 +56,7 @@ model HeatExchanger
     annotation (Placement(transformation(extent={{100,-20},{140,20}}),
     iconTransformation(extent={{100,-20},{140,20}})));
   // COMPONENTS
-  Buildings.Experimental.DHC.EnergyTransferStations.Combined.Controls.HeatExchanger con(
+  Buildings.DHC.ETS.Combined.Controls.HeatExchanger con(
     final conCon=conCon,
     final spePum1Min=spePum1Min,
     final spePum2Min=spePum2Min)
@@ -82,7 +82,7 @@ model HeatExchanger
         rotation=180,
         origin={0,0})));
 
-  DHC.EnergyTransferStations.BaseClasses.Pump_m_flow pum1(
+  DHC.ETS.BaseClasses.Pump_m_flow pum1(
     redeclare final package Medium = Medium1,
     final m_flow_nominal=m1_flow_nominal,
     final dp_nominal=dp1Hex_nominal,
@@ -91,7 +91,7 @@ model HeatExchanger
         extent={{10,10},{-10,-10}},
         rotation=180,
         origin={-60,80})));
-  DHC.EnergyTransferStations.BaseClasses.Pump_m_flow pum2(
+  DHC.ETS.BaseClasses.Pump_m_flow pum2(
     redeclare final package Medium = Medium2,
     final m_flow_nominal=m2_flow_nominal,
     final dp_nominal=dp2Hex_nominal + dpVal2_nominal,
@@ -158,7 +158,7 @@ model HeatExchanger
         extent={{10,-10},{-10,10}},
         rotation=0,
         origin={80,-60})));
-  DHC.EnergyTransferStations.BaseClasses.Junction spl(
+  DHC.ETS.BaseClasses.Junction spl(
     redeclare final package Medium = Medium2,
     final m_flow_nominal=m2_flow_nominal .* {1,-1,-1})
     "Flow splitter" annotation (Placement(transformation(
@@ -167,7 +167,7 @@ model HeatExchanger
         origin={-60,-60})));
 protected
   parameter Boolean have_val1=
-    conCon == DHC.EnergyTransferStations.Types.ConnectionConfiguration.TwoWayValve
+    conCon == DHC.ETS.Types.ConnectionConfiguration.TwoWayValve
     "True in case of control valve on district side, false in case of a pump";
 equation
   if have_val1 then
@@ -376,8 +376,8 @@ on the primary side.
 </p>
 <p>
 The system is controlled based on the logic described in
-<a href=\"modelica://Buildings.Experimental.DHC.EnergyTransferStations.Combined.Controls.HeatExchanger\">
-Buildings.Experimental.DHC.EnergyTransferStations.Combined.Controls.HeatExchanger</a>.
+<a href=\"modelica://Buildings.DHC.ETS.Combined.Controls.HeatExchanger\">
+Buildings.DHC.ETS.Combined.Controls.HeatExchanger</a>.
 The pump flow rate is considered proportional to the pump speed
 under the assumption of a constant flow resistance in both the primary and
 the secondary loops.
diff --git a/Buildings/Experimental/DHC/EnergyTransferStations/Combined/Subsystems/HeatPump.mo b/Buildings/DHC/ETS/Combined/Subsystems/HeatPump.mo
similarity index 94%
rename from Buildings/Experimental/DHC/EnergyTransferStations/Combined/Subsystems/HeatPump.mo
rename to Buildings/DHC/ETS/Combined/Subsystems/HeatPump.mo
index 277377ea6ee..9a9715a6c8e 100644
--- a/Buildings/Experimental/DHC/EnergyTransferStations/Combined/Subsystems/HeatPump.mo
+++ b/Buildings/DHC/ETS/Combined/Subsystems/HeatPump.mo
@@ -1,7 +1,7 @@
-within Buildings.Experimental.DHC.EnergyTransferStations.Combined.Subsystems;
+within Buildings.DHC.ETS.Combined.Subsystems;
 model HeatPump "Base subsystem with water-to-water heat pump"
   extends
-    Buildings.Experimental.DHC.EnergyTransferStations.Combined.Subsystems.BaseClasses.PartialHeatPump(
+    Buildings.DHC.ETS.Combined.Subsystems.BaseClasses.PartialHeatPump(
         heaPum(QCon_flow_nominal=Q1_flow_nominal));
   parameter Boolean have_varFloCon = true
     "Set to true for a variable condenser flow"
@@ -122,8 +122,8 @@ Buildings.Fluid.HeatPumps.Carnot_TCon</a>.
 By default, a variable speed condenser pump is considered, but a constant speed
 pump may also be represented by setting <code>have_varFloCon</code> to <code>false</code>.
 The evaporator hydronics and control are described in
-<a href=\"modelica://Buildings.Experimental.DHC.EnergyTransferStations.Combined.Subsystems.BaseClasses.PartialHeatPump\">
-Buildings.Experimental.DHC.EnergyTransferStations.Combined.Subsystems.BaseClasses.PartialHeatPump</a>.
+<a href=\"modelica://Buildings.DHC.ETS.Combined.Subsystems.BaseClasses.PartialHeatPump\">
+Buildings.DHC.ETS.Combined.Subsystems.BaseClasses.PartialHeatPump</a>.
 </p>
 <h4>Condenser Controls</h4>
 <p>
diff --git a/Buildings/Experimental/DHC/EnergyTransferStations/Combined/Subsystems/HeatPumpDHWTank.mo b/Buildings/DHC/ETS/Combined/Subsystems/HeatPumpDHWTank.mo
similarity index 93%
rename from Buildings/Experimental/DHC/EnergyTransferStations/Combined/Subsystems/HeatPumpDHWTank.mo
rename to Buildings/DHC/ETS/Combined/Subsystems/HeatPumpDHWTank.mo
index 151bfc3d62e..a9776fbcb36 100644
--- a/Buildings/Experimental/DHC/EnergyTransferStations/Combined/Subsystems/HeatPumpDHWTank.mo
+++ b/Buildings/DHC/ETS/Combined/Subsystems/HeatPumpDHWTank.mo
@@ -1,12 +1,12 @@
-within Buildings.Experimental.DHC.EnergyTransferStations.Combined.Subsystems;
+within Buildings.DHC.ETS.Combined.Subsystems;
 model HeatPumpDHWTank
   "Base subsystem with water-to-water heat pump with storage tank for domestic hot water"
   extends
-    Buildings.Experimental.DHC.EnergyTransferStations.Combined.Subsystems.BaseClasses.PartialHeatPump(
+    Buildings.DHC.ETS.Combined.Subsystems.BaseClasses.PartialHeatPump(
       heaPum(
         QCon_flow_nominal=QHotWat_flow_nominal,
         QCon_flow_max=QHotWat_flow_nominal));
-  parameter Buildings.Experimental.DHC.Loads.HotWater.Data.GenericDomesticHotWaterWithHeatExchanger
+  parameter Buildings.DHC.Loads.HotWater.Data.GenericDomesticHotWaterWithHeatExchanger
     datWatHea "Performance data"
     annotation (Placement(transformation(extent={{140,100},{160,120}})));
   parameter Modelica.Units.SI.HeatFlowRate QHotWat_flow_nominal(min=0)
@@ -18,7 +18,7 @@ model HeatPumpDHWTank
   Buildings.Controls.OBC.CDL.Conversions.BooleanToReal floCon(realTrue=
         mCon_flow_nominal) "Condenser mass flow rate"
     annotation (Placement(transformation(extent={{-80,80},{-60,100}})));
-  Buildings.Experimental.DHC.Loads.HotWater.StorageTankWithExternalHeatExchanger heaPumTan(
+  Buildings.DHC.Loads.HotWater.StorageTankWithExternalHeatExchanger heaPumTan(
     redeclare package MediumDom = Medium1,
     redeclare package MediumHea = Medium2,                      final dat=
         datWatHea)
@@ -339,16 +339,16 @@ Model of a water-to-water heat pump with temperature control on evaporator side,
 being connected to a domestic hot water tank with fresh water stations.
 </p>
 <p align=\"center\">
-<img src=\"modelica://Buildings/Resources/Images/Experimental/DHC/EnergyTransferStations/Combined/Subsystems/HeatPumpDHWTank.png\"
+<img src=\"modelica://Buildings/Resources/Images/DHC/ETS/Combined/Subsystems/HeatPumpDHWTank.png\"
   alt=\"Heat pump with domestic hot water tank\"/>
 </p>
 <p>
 The heat pump model with storage tank is described in
-<a href=\"modelica://Buildings.Experimental.DHC.Loads.HotWater.StorageTankWithExternalHeatExchanger\">
-Buildings.Experimental.DHC.Loads.HotWater.StorageTankWithExternalHeatExchanger</a>.
+<a href=\"modelica://Buildings.DHC.Loads.HotWater.StorageTankWithExternalHeatExchanger\">
+Buildings.DHC.Loads.HotWater.StorageTankWithExternalHeatExchanger</a>.
 The evaporator hydronics and control are described in
-<a href=\"modelica://Buildings.Experimental.DHC.EnergyTransferStations.Combined.Subsystems.BaseClasses.PartialHeatPump\">
-Buildings.Experimental.DHC.EnergyTransferStations.Combined.Subsystems.BaseClasses.PartialHeatPump</a>.
+<a href=\"modelica://Buildings.DHC.ETS.Combined.Subsystems.BaseClasses.PartialHeatPump\">
+Buildings.DHC.ETS.Combined.Subsystems.BaseClasses.PartialHeatPump</a>.
 </p>
 <h4>Condenser Controls</h4>
 <p>
diff --git a/Buildings/Experimental/DHC/EnergyTransferStations/Combined/Subsystems/SwitchBox.mo b/Buildings/DHC/ETS/Combined/Subsystems/SwitchBox.mo
similarity index 93%
rename from Buildings/Experimental/DHC/EnergyTransferStations/Combined/Subsystems/SwitchBox.mo
rename to Buildings/DHC/ETS/Combined/Subsystems/SwitchBox.mo
index 5083dba11f3..54908273e6b 100644
--- a/Buildings/Experimental/DHC/EnergyTransferStations/Combined/Subsystems/SwitchBox.mo
+++ b/Buildings/DHC/ETS/Combined/Subsystems/SwitchBox.mo
@@ -1,4 +1,4 @@
-within Buildings.Experimental.DHC.EnergyTransferStations.Combined.Subsystems;
+within Buildings.DHC.ETS.Combined.Subsystems;
 model SwitchBox
   "Model for mass flow rate redirection with three-port two-position directional valves"
   replaceable package Medium = Modelica.Media.Interfaces.PartialMedium
@@ -52,7 +52,7 @@ model SwitchBox
     iconTransformation(extent=
            {{-140,20},{-100,60}})));
   // COMPONENTS
-  Buildings.Experimental.DHC.EnergyTransferStations.BaseClasses.Junction splSup(
+  Buildings.DHC.ETS.BaseClasses.Junction splSup(
     redeclare final package Medium = Medium,
     m_flow_nominal={1,1,1}*m_flow_nominal)
     "Flow splitter"
@@ -60,7 +60,7 @@ model SwitchBox
         extent={{10,10},{-10,-10}},
         rotation=-90,
         origin={-20,40})));
-  Buildings.Experimental.DHC.EnergyTransferStations.BaseClasses.Junction splRet(
+  Buildings.DHC.ETS.BaseClasses.Junction splRet(
     redeclare final package Medium = Medium,
     m_flow_nominal={1,1,1}*m_flow_nominal)
     "Flow splitter"
@@ -68,7 +68,7 @@ model SwitchBox
         extent={{10,10},{-10,-10}},
         rotation=90,
         origin={20,0})));
-  Buildings.Experimental.DHC.EnergyTransferStations.Combined.Controls.SwitchBox con(
+  Buildings.DHC.ETS.Combined.Controls.SwitchBox con(
     final m_flow_nominal=m_flow_nominal,
     final trueHoldDuration=trueHoldDuration,
     final falseHoldDuration=falseHoldDuration)
@@ -253,12 +253,12 @@ equation
 <p>
 This model represents a hydronic arrangement avoid flow reversal in the service line,
 for instance when connecting an energy transfer station such as the one modeled in
-<a href=\"modelica://Buildings.Experimental.DHC.EnergyTransferStations.Combined.HeatPumpHeatExchanger\">
-Buildings.Experimental.DHC.EnergyTransferStations.Combined.HeatPumpHeatExchanger</a>.
+<a href=\"modelica://Buildings.DHC.ETS.Combined.HeatPumpHeatExchanger\">
+Buildings.DHC.ETS.Combined.HeatPumpHeatExchanger</a>.
 For that intent, two three-port two-position directional valves are used. The valves are
 actuated based on the logic described in
-<a href=\"modelica://Buildings.Experimental.DHC.EnergyTransferStations.Combined.Controls.SwitchBox\">
-Buildings.Experimental.DHC.EnergyTransferStations.Combined.Controls.SwitchBox</a>.
+<a href=\"modelica://Buildings.DHC.ETS.Combined.Controls.SwitchBox\">
+Buildings.DHC.ETS.Combined.Controls.SwitchBox</a>.
 </p>
 </html>", revisions="<html>
 <ul>
diff --git a/Buildings/Experimental/DHC/EnergyTransferStations/Combined/Subsystems/Validation/Borefield.mo b/Buildings/DHC/ETS/Combined/Subsystems/Validation/Borefield.mo
similarity index 86%
rename from Buildings/Experimental/DHC/EnergyTransferStations/Combined/Subsystems/Validation/Borefield.mo
rename to Buildings/DHC/ETS/Combined/Subsystems/Validation/Borefield.mo
index 9b1072ba1f9..ad2bda591a3 100644
--- a/Buildings/Experimental/DHC/EnergyTransferStations/Combined/Subsystems/Validation/Borefield.mo
+++ b/Buildings/DHC/ETS/Combined/Subsystems/Validation/Borefield.mo
@@ -1,4 +1,4 @@
-within Buildings.Experimental.DHC.EnergyTransferStations.Combined.Subsystems.Validation;
+within Buildings.DHC.ETS.Combined.Subsystems.Validation;
 model Borefield
   "Validation of the base subsystem model with geothermal borefield"
   extends Modelica.Icons.Example;
@@ -9,9 +9,9 @@ model Borefield
   parameter Modelica.Units.SI.Distance dxy=6
     "Distance in x-axis (and y-axis) between borehole axes";
   final parameter Modelica.Units.SI.Distance cooBor[nBorHol,2]=
-      Buildings.Experimental.DHC.EnergyTransferStations.BaseClasses.computeCoordinates(
+      Buildings.DHC.ETS.BaseClasses.computeCoordinates(
       nBorHol, dxy) "Coordinates of boreholes";
-  Buildings.Experimental.DHC.EnergyTransferStations.Combined.Subsystems.Borefield borFie(
+  Buildings.DHC.ETS.Combined.Subsystems.Borefield borFie(
     redeclare final package Medium=Medium,
     final datBorFie=datBorFie,
     dp_nominal=5E4,
@@ -88,7 +88,7 @@ equation
         preserveAspectRatio=false,
         extent={{-120,-100},{100,100}})),
     __Dymola_Commands(
-      file="modelica://Buildings/Resources/Scripts/Dymola/Experimental/DHC/EnergyTransferStations/Combined/Subsystems/Validation/Borefield.mos" "Simulate and plot"),
+      file="modelica://Buildings/Resources/Scripts/Dymola/DHC/ETS/Combined/Subsystems/Validation/Borefield.mos" "Simulate and plot"),
     experiment(
       StopTime=20000,
       Tolerance=1e-06),
@@ -104,8 +104,8 @@ First implementation.
       info="<html>
 <p>
 This model validates
-<a href=\"modelica://Buildings.Experimental.DHC.EnergyTransferStations.Combined.Subsystems.Borefield\">
-Buildings.Experimental.DHC.EnergyTransferStations.Combined.Subsystems.Borefield</a>.
+<a href=\"modelica://Buildings.DHC.ETS.Combined.Subsystems.Borefield\">
+Buildings.DHC.ETS.Combined.Subsystems.Borefield</a>.
 </p>
 </html>"));
 end Borefield;
diff --git a/Buildings/Experimental/DHC/EnergyTransferStations/Combined/Subsystems/Validation/Chiller.mo b/Buildings/DHC/ETS/Combined/Subsystems/Validation/Chiller.mo
similarity index 91%
rename from Buildings/Experimental/DHC/EnergyTransferStations/Combined/Subsystems/Validation/Chiller.mo
rename to Buildings/DHC/ETS/Combined/Subsystems/Validation/Chiller.mo
index 036032af38c..fbe9d73fe1c 100644
--- a/Buildings/Experimental/DHC/EnergyTransferStations/Combined/Subsystems/Validation/Chiller.mo
+++ b/Buildings/DHC/ETS/Combined/Subsystems/Validation/Chiller.mo
@@ -1,4 +1,4 @@
-within Buildings.Experimental.DHC.EnergyTransferStations.Combined.Subsystems.Validation;
+within Buildings.DHC.ETS.Combined.Subsystems.Validation;
 model Chiller
   "Validation of the base subsystem model with heat recovery chiller"
   extends Modelica.Icons.Example;
@@ -24,7 +24,7 @@ model Chiller
     TConEntMax=333.15)
     "Chiller performance data"
     annotation (Placement(transformation(extent={{20,100},{40,120}})));
-  Buildings.Experimental.DHC.EnergyTransferStations.Combined.Subsystems.Chiller chi(
+  Buildings.DHC.ETS.Combined.Subsystems.Chiller chi(
     redeclare final package Medium=Medium,
     final dat=datChi,
     dpCon_nominal=15E3,
@@ -138,7 +138,7 @@ equation
         preserveAspectRatio=false,
         extent={{-200,-140},{200,140}})),
     __Dymola_Commands(
-      file="modelica://Buildings/Resources/Scripts/Dymola/Experimental/DHC/EnergyTransferStations/Combined/Subsystems/Validation/Chiller.mos" "Simulate and plot"),
+      file="modelica://Buildings/Resources/Scripts/Dymola/DHC/ETS/Combined/Subsystems/Validation/Chiller.mos" "Simulate and plot"),
     experiment(
       StopTime=5000,
       Tolerance=1e-06),
@@ -154,8 +154,8 @@ First implementation.
       info="<html>
 <p>
 This model validates
-<a href=\"modelica://Buildings.Experimental.DHC.EnergyTransferStations.Combined.Subsystems.Chiller\">
-Buildings.Experimental.DHC.EnergyTransferStations.Combined.Subsystems.Chiller</a>.
+<a href=\"modelica://Buildings.DHC.ETS.Combined.Subsystems.Chiller\">
+Buildings.DHC.ETS.Combined.Subsystems.Chiller</a>.
 </p>
 </html>"));
 end Chiller;
diff --git a/Buildings/Experimental/DHC/EnergyTransferStations/Combined/Subsystems/Validation/HeatExchanger.mo b/Buildings/DHC/ETS/Combined/Subsystems/Validation/HeatExchanger.mo
similarity index 93%
rename from Buildings/Experimental/DHC/EnergyTransferStations/Combined/Subsystems/Validation/HeatExchanger.mo
rename to Buildings/DHC/ETS/Combined/Subsystems/Validation/HeatExchanger.mo
index 574910c1e65..53c71261821 100644
--- a/Buildings/Experimental/DHC/EnergyTransferStations/Combined/Subsystems/Validation/HeatExchanger.mo
+++ b/Buildings/DHC/ETS/Combined/Subsystems/Validation/HeatExchanger.mo
@@ -1,4 +1,4 @@
-within Buildings.Experimental.DHC.EnergyTransferStations.Combined.Subsystems.Validation;
+within Buildings.DHC.ETS.Combined.Subsystems.Validation;
 model HeatExchanger
   "Validation of the base subsystem model with district heat exchanger"
   extends Modelica.Icons.Example;
@@ -27,11 +27,11 @@ model HeatExchanger
     y=time >= 1000 and time < 3000)
     "Cold rejection enable signal"
     annotation (Placement(transformation(extent={{-190,70},{-170,90}})));
-  Buildings.Experimental.DHC.EnergyTransferStations.Combined.Subsystems.HeatExchanger hexPum(
+  Buildings.DHC.ETS.Combined.Subsystems.HeatExchanger hexPum(
     redeclare final package Medium1 = Medium,
     redeclare final package Medium2 = Medium,
     show_T=true,
-    conCon=Buildings.Experimental.DHC.EnergyTransferStations.Types.ConnectionConfiguration.Pump,
+    conCon=Buildings.DHC.ETS.Types.ConnectionConfiguration.Pump,
     dp1Hex_nominal=20E3,
     dp2Hex_nominal=20E3,
     Q_flow_nominal=1E6,
@@ -68,11 +68,11 @@ model HeatExchanger
         extent={{-10,-10},{10,10}},
         rotation=0,
         origin={-30,-100})));
-  Buildings.Experimental.DHC.EnergyTransferStations.Combined.Subsystems.HeatExchanger hexVal(
+  Buildings.DHC.ETS.Combined.Subsystems.HeatExchanger hexVal(
     redeclare final package Medium1 = Medium,
     redeclare final package Medium2 = Medium,
     show_T=true,
-    conCon=Buildings.Experimental.DHC.EnergyTransferStations.Types.ConnectionConfiguration.TwoWayValve,
+    conCon=Buildings.DHC.ETS.Types.ConnectionConfiguration.TwoWayValve,
     dp1Hex_nominal=20E3,
     dp2Hex_nominal=20E3,
     Q_flow_nominal=1E6,
@@ -274,7 +274,7 @@ equation
         preserveAspectRatio=false,
         extent={{-220,-160},{220,160}})),
     __Dymola_Commands(
-      file="modelica://Buildings/Resources/Scripts/Dymola/Experimental/DHC/EnergyTransferStations/Combined/Subsystems/Validation/HeatExchanger.mos" "Simulate and plot"),
+      file="modelica://Buildings/Resources/Scripts/Dymola/DHC/ETS/Combined/Subsystems/Validation/HeatExchanger.mos" "Simulate and plot"),
     experiment(
       StopTime=5000,
       Tolerance=1e-06),
@@ -290,8 +290,8 @@ First implementation.
       info="<html>
 <p>
 This model validates
-<a href=\"modelica://Buildings.Experimental.DHC.EnergyTransferStations.Combined.Subsystems.HeatExchanger\">
-Buildings.Experimental.DHC.EnergyTransferStations.Combined.Subsystems.HeatExchanger</a>
+<a href=\"modelica://Buildings.DHC.ETS.Combined.Subsystems.HeatExchanger\">
+Buildings.DHC.ETS.Combined.Subsystems.HeatExchanger</a>
 in a configuration where the primary flow rate is modulated by means of a
 two-way valve (see <code>hexVal</code>), and in a configuration where the
 primary flow rate is modulated by means of a variable speed pump
diff --git a/Buildings/Experimental/DHC/EnergyTransferStations/Combined/Subsystems/Validation/HeatPump.mo b/Buildings/DHC/ETS/Combined/Subsystems/Validation/HeatPump.mo
similarity index 91%
rename from Buildings/Experimental/DHC/EnergyTransferStations/Combined/Subsystems/Validation/HeatPump.mo
rename to Buildings/DHC/ETS/Combined/Subsystems/Validation/HeatPump.mo
index 4fdb26cd64a..583ac9e5e47 100644
--- a/Buildings/Experimental/DHC/EnergyTransferStations/Combined/Subsystems/Validation/HeatPump.mo
+++ b/Buildings/DHC/ETS/Combined/Subsystems/Validation/HeatPump.mo
@@ -1,4 +1,4 @@
-within Buildings.Experimental.DHC.EnergyTransferStations.Combined.Subsystems.Validation;
+within Buildings.DHC.ETS.Combined.Subsystems.Validation;
 model HeatPump
   "Validation of the base subsystem model with heat pump"
   extends Modelica.Icons.Example;
@@ -7,7 +7,7 @@ model HeatPump
   parameter Modelica.Units.SI.Temperature TCon_nominal = 273.15+30 "Nominal condenser outlet temperature";
   parameter Modelica.Units.SI.Temperature TAmb_nominal = 273.15+15 "Nominal ambient loop temperature to evaporator";
   parameter Modelica.Units.SI.Power QLoa_nominal = 1000 "Nominal load";
-  Buildings.Experimental.DHC.EnergyTransferStations.Combined.Subsystems.HeatPump
+  Buildings.DHC.ETS.Combined.Subsystems.HeatPump
     heaPum(
     redeclare package Medium1 = Medium,
     redeclare package Medium2 = Medium,
@@ -104,7 +104,7 @@ equation
         preserveAspectRatio=false,
         extent={{-120,-100},{100,100}})),
     __Dymola_Commands(
-      file="modelica://Buildings/Resources/Scripts/Dymola/Experimental/DHC/EnergyTransferStations/Combined/Subsystems/Validation/HeatPump.mos" "Simulate and plot"),
+      file="modelica://Buildings/Resources/Scripts/Dymola/DHC/ETS/Combined/Subsystems/Validation/HeatPump.mos" "Simulate and plot"),
     experiment(
       StopTime=172800,
       Tolerance=1e-06),
@@ -124,8 +124,8 @@ First implementation.
       info="<html>
 <p>
 This model validates
-<a href=\"modelica://Buildings.Experimental.DHC.EnergyTransferStations.Combined.Subsystems.HeatPump\">
-Buildings.Experimental.DHC.EnergyTransferStations.Combined.Subsystems.HeatPump</a>.
+<a href=\"modelica://Buildings.DHC.ETS.Combined.Subsystems.HeatPump\">
+Buildings.DHC.ETS.Combined.Subsystems.HeatPump</a>.
 </p>
 </html>"));
 end HeatPump;
diff --git a/Buildings/Experimental/DHC/EnergyTransferStations/Combined/Subsystems/Validation/HeatPumpDHWTank.mo b/Buildings/DHC/ETS/Combined/Subsystems/Validation/HeatPumpDHWTank.mo
similarity index 89%
rename from Buildings/Experimental/DHC/EnergyTransferStations/Combined/Subsystems/Validation/HeatPumpDHWTank.mo
rename to Buildings/DHC/ETS/Combined/Subsystems/Validation/HeatPumpDHWTank.mo
index c14dc0bc088..187bdc530f8 100644
--- a/Buildings/Experimental/DHC/EnergyTransferStations/Combined/Subsystems/Validation/HeatPumpDHWTank.mo
+++ b/Buildings/DHC/ETS/Combined/Subsystems/Validation/HeatPumpDHWTank.mo
@@ -1,4 +1,4 @@
-within Buildings.Experimental.DHC.EnergyTransferStations.Combined.Subsystems.Validation;
+within Buildings.DHC.ETS.Combined.Subsystems.Validation;
 model HeatPumpDHWTank
   "Validation of the base subsystem model with domestic hot water tank and heat pump"
   extends Modelica.Icons.Example;
@@ -8,7 +8,7 @@ model HeatPumpDHWTank
     "Nominal temperature difference across heat pump condensor and district supply/return water";
   parameter Modelica.Units.SI.Temperature TDisSup_nominal = 273.15 + 15
     "Nominal district supply water temperature";
-  Buildings.Experimental.DHC.EnergyTransferStations.Combined.Subsystems.HeatPumpDHWTank
+  Buildings.DHC.ETS.Combined.Subsystems.HeatPumpDHWTank
     heaPum(
     redeclare package Medium1 = Medium,
     redeclare package Medium2 = Medium,
@@ -50,7 +50,7 @@ model HeatPumpDHWTank
       extent={{10,-10},{-10,10}},
       rotation=180,
       origin={-70,-30})));
-  Buildings.Experimental.DHC.EnergyTransferStations.BaseClasses.Junction dcwSpl(
+  Buildings.DHC.ETS.BaseClasses.Junction dcwSpl(
       redeclare final package Medium = Medium, final m_flow_nominal=6000*{1,-1,
         -1})                                 "Splitter for domestic cold water"
     annotation (Placement(transformation(
@@ -60,7 +60,7 @@ model HeatPumpDHWTank
   Modelica.Blocks.Sources.CombiTimeTable sch(
     tableOnFile=true,
     tableName="tab1",
-    fileName=Modelica.Utilities.Files.loadResource("modelica://Buildings/Resources/Data/Experimental/DHC/Loads/HotWater/DHW_ApartmentMidRise.mos"),
+    fileName=Modelica.Utilities.Files.loadResource("modelica://Buildings/Resources/Data/DHC/Loads/HotWater/DHW_ApartmentMidRise.mos"),
     smoothness=Modelica.Blocks.Types.Smoothness.ContinuousDerivative,
     extrapolation=Modelica.Blocks.Types.Extrapolation.Periodic)
     "Domestic hot water fixture draw fraction schedule"
@@ -112,7 +112,7 @@ equation
         preserveAspectRatio=false,
         extent={{-120,-100},{100,100}})),
     __Dymola_Commands(
-      file="modelica://Buildings/Resources/Scripts/Dymola/Experimental/DHC/EnergyTransferStations/Combined/Subsystems/Validation/HeatPumpDHWTank.mos" "Simulate and plot"),
+      file="modelica://Buildings/Resources/Scripts/Dymola/DHC/ETS/Combined/Subsystems/Validation/HeatPumpDHWTank.mos" "Simulate and plot"),
     experiment(
       StopTime=172800,
       Tolerance=1e-06),
@@ -132,8 +132,8 @@ First implementation.
       info="<html>
 <p>
 This model validates
-<a href=\"modelica://Buildings.Experimental.DHC.EnergyTransferStations.Combined.Subsystems.HeatPumpDHWTank\">
-Buildings.Experimental.DHC.EnergyTransferStations.Combined.Subsystems.HeatPumpDHWTank</a>.
+<a href=\"modelica://Buildings.DHC.ETS.Combined.Subsystems.HeatPumpDHWTank\">
+Buildings.DHC.ETS.Combined.Subsystems.HeatPumpDHWTank</a>.
 </p>
 </html>"));
 end HeatPumpDHWTank;
diff --git a/Buildings/Experimental/DHC/EnergyTransferStations/Combined/Subsystems/Validation/SwitchBox.mo b/Buildings/DHC/ETS/Combined/Subsystems/Validation/SwitchBox.mo
similarity index 89%
rename from Buildings/Experimental/DHC/EnergyTransferStations/Combined/Subsystems/Validation/SwitchBox.mo
rename to Buildings/DHC/ETS/Combined/Subsystems/Validation/SwitchBox.mo
index de6af5b972a..700488d0513 100644
--- a/Buildings/Experimental/DHC/EnergyTransferStations/Combined/Subsystems/Validation/SwitchBox.mo
+++ b/Buildings/DHC/ETS/Combined/Subsystems/Validation/SwitchBox.mo
@@ -1,4 +1,4 @@
-within Buildings.Experimental.DHC.EnergyTransferStations.Combined.Subsystems.Validation;
+within Buildings.DHC.ETS.Combined.Subsystems.Validation;
 model SwitchBox "Validation of flow switch box"
   extends Modelica.Icons.Example;
 
@@ -24,17 +24,17 @@ model SwitchBox "Validation of flow switch box"
         extent={{-10,10},{10,-10}},
         rotation=90,
         origin={70,0})));
-  Buildings.Experimental.DHC.EnergyTransferStations.BaseClasses.Pump_m_flow pum1(
+  Buildings.DHC.ETS.BaseClasses.Pump_m_flow pum1(
     redeclare package Medium = Medium,
     final m_flow_nominal=m_flow_nominal)
     "Chilled water HX secondary pump"
     annotation (Placement(transformation(extent={{10,-10},{-10,10}})));
-  Buildings.Experimental.DHC.EnergyTransferStations.BaseClasses.Pump_m_flow pum2(
+  Buildings.DHC.ETS.BaseClasses.Pump_m_flow pum2(
     redeclare package Medium = Medium,
     final m_flow_nominal=m_flow_nominal)
     "Chilled water HX secondary pump"
     annotation (Placement(transformation(extent={{-10,50},{10,70}})));
-  Buildings.Experimental.DHC.EnergyTransferStations.Combined.Subsystems.SwitchBox
+  Buildings.DHC.ETS.Combined.Subsystems.SwitchBox
     floSwiBox(final m_flow_nominal=m_flow_nominal, redeclare final package
       Medium = Medium,
     trueHoldDuration=300)
@@ -104,8 +104,8 @@ equation
     Documentation(info="<html>
 <p>
 This model validates that
-<a href=\"modelica://Buildings.Experimental.DHC.EnergyTransferStations.Combined.Subsystems.SwitchBox\">
-Buildings.Experimental.DHC.EnergyTransferStations.Combined.Subsystems.SwitchBox</a>
+<a href=\"modelica://Buildings.DHC.ETS.Combined.Subsystems.SwitchBox\">
+Buildings.DHC.ETS.Combined.Subsystems.SwitchBox</a>
 maintains a positive flow rate in the district line outside of the temporization
 period set by the controller.
 </p>
@@ -114,6 +114,6 @@ period set by the controller.
       StopTime=1000,
       Tolerance=1e-06),
     __Dymola_Commands(
-    file="modelica://Buildings/Resources/Scripts/Dymola/Experimental/DHC/EnergyTransferStations/Combined/Subsystems/Validation/SwitchBox.mos"
+    file="modelica://Buildings/Resources/Scripts/Dymola/DHC/ETS/Combined/Subsystems/Validation/SwitchBox.mos"
     "Simulate and plot"));
 end SwitchBox;
diff --git a/Buildings/Experimental/DHC/EnergyTransferStations/Combined/Subsystems/Validation/WatersideEconomizer.mo b/Buildings/DHC/ETS/Combined/Subsystems/Validation/WatersideEconomizer.mo
similarity index 93%
rename from Buildings/Experimental/DHC/EnergyTransferStations/Combined/Subsystems/Validation/WatersideEconomizer.mo
rename to Buildings/DHC/ETS/Combined/Subsystems/Validation/WatersideEconomizer.mo
index 198d864abf9..4f6d7f19681 100644
--- a/Buildings/Experimental/DHC/EnergyTransferStations/Combined/Subsystems/Validation/WatersideEconomizer.mo
+++ b/Buildings/DHC/ETS/Combined/Subsystems/Validation/WatersideEconomizer.mo
@@ -1,4 +1,4 @@
-within Buildings.Experimental.DHC.EnergyTransferStations.Combined.Subsystems.Validation;
+within Buildings.DHC.ETS.Combined.Subsystems.Validation;
 model WatersideEconomizer
   "Validation of the base subsystem model with waterside economizer"
   extends Modelica.Icons.Example;
@@ -25,11 +25,11 @@ model WatersideEconomizer
   Modelica.Blocks.Sources.BooleanExpression uCoo(y=time >= 1000)
     "Cooling enable signal"
     annotation (Placement(transformation(extent={{-200,70},{-180,90}})));
-  Buildings.Experimental.DHC.EnergyTransferStations.Combined.Subsystems.WatersideEconomizer hexPum(
+  Buildings.DHC.ETS.Combined.Subsystems.WatersideEconomizer hexPum(
     redeclare final package Medium1=Medium,
     redeclare final package Medium2=Medium,
     show_T=true,
-    conCon=Buildings.Experimental.DHC.EnergyTransferStations.Types.ConnectionConfiguration.Pump,
+    conCon=Buildings.DHC.ETS.Types.ConnectionConfiguration.Pump,
     dp1Hex_nominal=3E4,
     dp2Hex_nominal=3E4,
     Q_flow_nominal=-1E6,
@@ -63,11 +63,11 @@ model WatersideEconomizer
         extent={{-10,-10},{10,10}},
         rotation=0,
         origin={-40,-80})));
-  Buildings.Experimental.DHC.EnergyTransferStations.Combined.Subsystems.WatersideEconomizer hexVal(
+  Buildings.DHC.ETS.Combined.Subsystems.WatersideEconomizer hexVal(
     redeclare final package Medium1=Medium,
     redeclare final package Medium2=Medium,
     show_T=true,
-    conCon=Buildings.Experimental.DHC.EnergyTransferStations.Types.ConnectionConfiguration.TwoWayValve,
+    conCon=Buildings.DHC.ETS.Types.ConnectionConfiguration.TwoWayValve,
     dp1Hex_nominal=3E4,
     dp2Hex_nominal=3E4,
     Q_flow_nominal=-1E6,
@@ -246,7 +246,7 @@ equation
         preserveAspectRatio=false,
         extent={{-220,-120},{220,120}})),
     __Dymola_Commands(
-      file="modelica://Buildings/Resources/Scripts/Dymola/Experimental/DHC/EnergyTransferStations/Combined/Subsystems/Validation/WatersideEconomizer.mos"
+      file="modelica://Buildings/Resources/Scripts/Dymola/DHC/ETS/Combined/Subsystems/Validation/WatersideEconomizer.mos"
       "Simulate and plot"),
     experiment(
       StopTime=5000,
@@ -263,8 +263,8 @@ First implementation.
       info="<html>
 <p>
 This model validates
-<a href=\"modelica://Buildings.Experimental.DHC.EnergyTransferStations.Combined.Subsystems.WatersideEconomizer\">
-Buildings.Experimental.DHC.EnergyTransferStations.Combined.Subsystems.WatersideEconomizer</a>
+<a href=\"modelica://Buildings.DHC.ETS.Combined.Subsystems.WatersideEconomizer\">
+Buildings.DHC.ETS.Combined.Subsystems.WatersideEconomizer</a>
 in a configuration where the primary flow rate is modulated by means of a
 two-way valve (see <code>hexVal</code>), and in a configuration where the
 primary flow rate is modulated by means of a variable speed pump
diff --git a/Buildings/Experimental/DHC/EnergyTransferStations/BaseClasses/Validation/package.mo b/Buildings/DHC/ETS/Combined/Subsystems/Validation/package.mo
similarity index 52%
rename from Buildings/Experimental/DHC/EnergyTransferStations/BaseClasses/Validation/package.mo
rename to Buildings/DHC/ETS/Combined/Subsystems/Validation/package.mo
index b8c1315b6c3..1c5514e32f2 100644
--- a/Buildings/Experimental/DHC/EnergyTransferStations/BaseClasses/Validation/package.mo
+++ b/Buildings/DHC/ETS/Combined/Subsystems/Validation/package.mo
@@ -1,4 +1,4 @@
-within Buildings.Experimental.DHC.EnergyTransferStations.BaseClasses;
+within Buildings.DHC.ETS.Combined.Subsystems;
 package Validation "Collection of validation models"
   extends Modelica.Icons.ExamplesPackage;
 
@@ -7,8 +7,8 @@ package Validation "Collection of validation models"
       info="<html>
 <p>
 This package contains validation models for the classes in
-<a href=\"modelica://Buildings.Experimental.DHC.EnergyTransferStations.BaseClasses\">
-Buildings.Experimental.DHC.EnergyTransferStations.BaseClasses</a>.
+<a href=\"modelica://Buildings.DHC.ETS.Combined.Subsystems\">
+Buildings.DHC.ETS.Combined.Subsystems</a>.
 </p>
 </html>"));
 end Validation;
diff --git a/Buildings/Experimental/DHC/EnergyTransferStations/Combined/Subsystems/Validation/package.order b/Buildings/DHC/ETS/Combined/Subsystems/Validation/package.order
similarity index 100%
rename from Buildings/Experimental/DHC/EnergyTransferStations/Combined/Subsystems/Validation/package.order
rename to Buildings/DHC/ETS/Combined/Subsystems/Validation/package.order
diff --git a/Buildings/Experimental/DHC/EnergyTransferStations/Combined/Subsystems/WatersideEconomizer.mo b/Buildings/DHC/ETS/Combined/Subsystems/WatersideEconomizer.mo
similarity index 96%
rename from Buildings/Experimental/DHC/EnergyTransferStations/Combined/Subsystems/WatersideEconomizer.mo
rename to Buildings/DHC/ETS/Combined/Subsystems/WatersideEconomizer.mo
index 6d7286ecaae..f40caadf7c4 100644
--- a/Buildings/Experimental/DHC/EnergyTransferStations/Combined/Subsystems/WatersideEconomizer.mo
+++ b/Buildings/DHC/ETS/Combined/Subsystems/WatersideEconomizer.mo
@@ -1,10 +1,10 @@
-within Buildings.Experimental.DHC.EnergyTransferStations.Combined.Subsystems;
+within Buildings.DHC.ETS.Combined.Subsystems;
 model WatersideEconomizer
   "Base subsystem with waterside economizer"
   extends Buildings.Fluid.Interfaces.PartialFourPortInterface(
     final m1_flow_nominal=abs(Q_flow_nominal/4200/(T_b1_nominal - T_a1_nominal)),
     final m2_flow_nominal=abs(Q_flow_nominal/4200/(T_b2_nominal - T_a2_nominal)));
-  parameter DHC.EnergyTransferStations.Types.ConnectionConfiguration conCon
+  parameter DHC.ETS.Types.ConnectionConfiguration conCon
     "District connection configuration" annotation (Evaluate=true);
   parameter Modelica.Units.SI.PressureDifference dp1Hex_nominal(displayUnit=
         "Pa") "Nominal pressure drop across heat exchanger on district side"
@@ -58,7 +58,7 @@ model WatersideEconomizer
     annotation (Placement(transformation(extent={{100,-20},{140,20}}),
     iconTransformation(extent={{100,-20},{140,20}})));
   // COMPONENTS
-  Buildings.Experimental.DHC.EnergyTransferStations.Combined.Controls.WatersideEconomizer conWSE(
+  Buildings.DHC.ETS.Combined.Controls.WatersideEconomizer conWSE(
     final m2_flow_nominal=m2_flow_nominal,
     final y1Min=y1Min,
     final T_a1_nominal=T_a1_nominal,
@@ -83,7 +83,7 @@ model WatersideEconomizer
     final T_a2_nominal=T_a2_nominal)
     "Heat exchanger" annotation (Placement(
         transformation(extent={{10,10},{-10,-10}}, rotation=180)));
-  DHC.EnergyTransferStations.BaseClasses.Pump_m_flow pum1(
+  DHC.ETS.BaseClasses.Pump_m_flow pum1(
     redeclare final package Medium = Medium1,
     final m_flow_nominal=m1_flow_nominal,
     final dp_nominal=dp1Hex_nominal,
@@ -161,7 +161,7 @@ model WatersideEconomizer
         origin={-80,-60})));
 protected
   parameter Boolean have_val1=
-    conCon ==Buildings.Experimental.DHC.EnergyTransferStations.Types.ConnectionConfiguration.TwoWayValve
+    conCon ==Buildings.DHC.ETS.Types.ConnectionConfiguration.TwoWayValve
     "True in case of control valve on district side, false in case of a pump";
 equation
   if not have_val1 then
@@ -365,8 +365,8 @@ using a three-port two-position directional control valve.
 </p>
 <p>
 The system is controlled based on the logic described in
-<a href=\"modelica://Buildings.Experimental.DHC.EnergyTransferStations.Combined.Controls.WatersideEconomizer\">
-Buildings.Experimental.DHC.EnergyTransferStations.Combined.Controls.WatersideEconomizer</a>.
+<a href=\"modelica://Buildings.DHC.ETS.Combined.Controls.WatersideEconomizer\">
+Buildings.DHC.ETS.Combined.Controls.WatersideEconomizer</a>.
 </p>
 </html>"));
 end WatersideEconomizer;
diff --git a/Buildings/Experimental/DHC/EnergyTransferStations/Combined/Subsystems/package.mo b/Buildings/DHC/ETS/Combined/Subsystems/package.mo
similarity index 84%
rename from Buildings/Experimental/DHC/EnergyTransferStations/Combined/Subsystems/package.mo
rename to Buildings/DHC/ETS/Combined/Subsystems/package.mo
index 9325bac7e5f..b2bfddf9fb3 100644
--- a/Buildings/Experimental/DHC/EnergyTransferStations/Combined/Subsystems/package.mo
+++ b/Buildings/DHC/ETS/Combined/Subsystems/package.mo
@@ -1,4 +1,4 @@
-within Buildings.Experimental.DHC.EnergyTransferStations.Combined;
+within Buildings.DHC.ETS.Combined;
 package Subsystems "Package of models for subsystems of fifth generation DHC ETS"
   extends Modelica.Icons.VariantsPackage;
 
diff --git a/Buildings/Experimental/DHC/EnergyTransferStations/Combined/Subsystems/package.order b/Buildings/DHC/ETS/Combined/Subsystems/package.order
similarity index 100%
rename from Buildings/Experimental/DHC/EnergyTransferStations/Combined/Subsystems/package.order
rename to Buildings/DHC/ETS/Combined/Subsystems/package.order
diff --git a/Buildings/Experimental/DHC/EnergyTransferStations/Combined/Validation/BaseClasses/PartialChillerBorefield.mo b/Buildings/DHC/ETS/Combined/Validation/BaseClasses/PartialChillerBorefield.mo
similarity index 98%
rename from Buildings/Experimental/DHC/EnergyTransferStations/Combined/Validation/BaseClasses/PartialChillerBorefield.mo
rename to Buildings/DHC/ETS/Combined/Validation/BaseClasses/PartialChillerBorefield.mo
index d2a5c45dcf7..83fce3652f2 100644
--- a/Buildings/Experimental/DHC/EnergyTransferStations/Combined/Validation/BaseClasses/PartialChillerBorefield.mo
+++ b/Buildings/DHC/ETS/Combined/Validation/BaseClasses/PartialChillerBorefield.mo
@@ -1,4 +1,4 @@
-within Buildings.Experimental.DHC.EnergyTransferStations.Combined.Validation.BaseClasses;
+within Buildings.DHC.ETS.Combined.Validation.BaseClasses;
 partial model PartialChillerBorefield
   "Partial validation of the ETS model with heat recovery chiller and optional borefield"
   extends Modelica.Icons.Example;
@@ -58,7 +58,7 @@ partial model PartialChillerBorefield
         extent={{-10,-10},{10,10}},
         rotation=0,
         origin={90,40})));
-  Buildings.Experimental.DHC.EnergyTransferStations.Combined.ChillerBorefield ets(
+  Buildings.DHC.ETS.Combined.ChillerBorefield ets(
     redeclare package MediumSer = Medium,
     redeclare package MediumBui = Medium,
     QChiWat_flow_nominal=QCoo_flow_nominal,
@@ -100,7 +100,7 @@ partial model PartialChillerBorefield
         extent={{-10,-10},{10,10}},
         rotation=0,
         origin={-110,-140})));
-  DHC.EnergyTransferStations.BaseClasses.Pump_m_flow pumChiWat(
+  DHC.ETS.BaseClasses.Pump_m_flow pumChiWat(
     redeclare package Medium = Medium,
     final m_flow_nominal=mChiWat_flow_nominal,
     dp_nominal=100E3) "Chilled water distribution pump"
@@ -111,7 +111,7 @@ partial model PartialChillerBorefield
   Buildings.Controls.OBC.CDL.Reals.MultiplyByParameter gai1(final k=
         mHeaWat_flow_nominal) "Scale to nominal mass flow rate"
     annotation (Placement(transformation(extent={{40,90},{20,110}})));
-  DHC.EnergyTransferStations.BaseClasses.Pump_m_flow pumHeaWat(
+  DHC.ETS.BaseClasses.Pump_m_flow pumHeaWat(
     redeclare package Medium = Medium,
     final m_flow_nominal=mHeaWat_flow_nominal,
     dp_nominal=100E3) "Heating water distribution pump"
diff --git a/Buildings/DHC/ETS/Combined/Validation/BaseClasses/package.mo b/Buildings/DHC/ETS/Combined/Validation/BaseClasses/package.mo
new file mode 100644
index 00000000000..e7d6e515e3c
--- /dev/null
+++ b/Buildings/DHC/ETS/Combined/Validation/BaseClasses/package.mo
@@ -0,0 +1,14 @@
+within Buildings.DHC.ETS.Combined.Validation;
+package BaseClasses "Package with base classes"
+  extends Modelica.Icons.BasesPackage;
+
+  annotation (
+    Documentation(
+      info="<html>
+<p>
+This package contains base classes that are used to construct the classes in
+<a href=\"modelica://Buildings.DHC.ETS.Combined.Validation\">
+Buildings.DHC.ETS.Combined.Validation</a>.
+</p>
+</html>"));
+end BaseClasses;
diff --git a/Buildings/Experimental/DHC/EnergyTransferStations/Combined/Validation/BaseClasses/package.order b/Buildings/DHC/ETS/Combined/Validation/BaseClasses/package.order
similarity index 100%
rename from Buildings/Experimental/DHC/EnergyTransferStations/Combined/Validation/BaseClasses/package.order
rename to Buildings/DHC/ETS/Combined/Validation/BaseClasses/package.order
diff --git a/Buildings/Experimental/DHC/EnergyTransferStations/Combined/Validation/ChillerBorefield.mo b/Buildings/DHC/ETS/Combined/Validation/ChillerBorefield.mo
similarity index 62%
rename from Buildings/Experimental/DHC/EnergyTransferStations/Combined/Validation/ChillerBorefield.mo
rename to Buildings/DHC/ETS/Combined/Validation/ChillerBorefield.mo
index 14580dafc6d..a86a42b464c 100644
--- a/Buildings/Experimental/DHC/EnergyTransferStations/Combined/Validation/ChillerBorefield.mo
+++ b/Buildings/DHC/ETS/Combined/Validation/ChillerBorefield.mo
@@ -1,4 +1,4 @@
-within Buildings.Experimental.DHC.EnergyTransferStations.Combined.Validation;
+within Buildings.DHC.ETS.Combined.Validation;
 model ChillerBorefield
   "Validation of the ETS model with heat recovery chiller and borefield"
   extends ChillerOnly(
@@ -10,7 +10,7 @@ model ChillerBorefield
   parameter Modelica.Units.SI.Distance dxy=6
     "Distance in x-axis (and y-axis) between borehole axes";
   final parameter Modelica.Units.SI.Distance cooBor[nBorHol,2]=
-      Buildings.Experimental.DHC.EnergyTransferStations.BaseClasses.computeCoordinates(nBorHol, dxy)
+      Buildings.DHC.ETS.BaseClasses.computeCoordinates(nBorHol, dxy)
     "Coordinates of boreholes";
   parameter Fluid.Geothermal.Borefields.Data.Borefield.Example datBorFie(
     conDat=Fluid.Geothermal.Borefields.Data.Configuration.Example(
@@ -20,7 +20,7 @@ model ChillerBorefield
     annotation (Placement(transformation(extent={{60,180},{80,200}})));
   annotation (
     __Dymola_Commands(
-      file="modelica://Buildings/Resources/Scripts/Dymola/Experimental/DHC/EnergyTransferStations/Combined/Validation/ChillerBorefield.mos" "Simulate and plot"),
+      file="modelica://Buildings/Resources/Scripts/Dymola/DHC/ETS/Combined/Validation/ChillerBorefield.mos" "Simulate and plot"),
     experiment(
       StopTime=360000,
       Tolerance=1e-06),
@@ -36,12 +36,12 @@ First implementation.
       info="<html>
 <p>
 This model validates
-<a href=\"modelica://Buildings.Experimental.DHC.EnergyTransferStations.Combined.ChillerBorefield\">
-Buildings.Experimental.DHC.EnergyTransferStations.Combined.ChillerBorefield</a>
+<a href=\"modelica://Buildings.DHC.ETS.Combined.ChillerBorefield\">
+Buildings.DHC.ETS.Combined.ChillerBorefield</a>
 in a system configuration including a geothermal borefield.
 See
-<a href=\"modelica://Buildings.Experimental.DHC.EnergyTransferStations.Combined.Validation.ChillerOnly\">
-Buildings.Experimental.DHC.EnergyTransferStations.Combined.Validation.ChillerOnly</a>
+<a href=\"modelica://Buildings.DHC.ETS.Combined.Validation.ChillerOnly\">
+Buildings.DHC.ETS.Combined.Validation.ChillerOnly</a>
 for the description of the main modeling assumptions.
 </p>
 </html>"));
diff --git a/Buildings/Experimental/DHC/EnergyTransferStations/Combined/Validation/ChillerOnly.mo b/Buildings/DHC/ETS/Combined/Validation/ChillerOnly.mo
similarity index 67%
rename from Buildings/Experimental/DHC/EnergyTransferStations/Combined/Validation/ChillerOnly.mo
rename to Buildings/DHC/ETS/Combined/Validation/ChillerOnly.mo
index 7aa62903c94..b8e5b1d39b5 100644
--- a/Buildings/Experimental/DHC/EnergyTransferStations/Combined/Validation/ChillerOnly.mo
+++ b/Buildings/DHC/ETS/Combined/Validation/ChillerOnly.mo
@@ -1,7 +1,7 @@
-within Buildings.Experimental.DHC.EnergyTransferStations.Combined.Validation;
+within Buildings.DHC.ETS.Combined.Validation;
 model ChillerOnly
   "Validation of the ETS model with heat recovery chiller"
-  extends Buildings.Experimental.DHC.EnergyTransferStations.Combined.Validation.BaseClasses.PartialChillerBorefield;
+  extends Buildings.DHC.ETS.Combined.Validation.BaseClasses.PartialChillerBorefield;
   Modelica.Blocks.Sources.CombiTimeTable TDisWatSup(
     tableName="tab1",
     table=[
@@ -25,7 +25,7 @@ equation
     annotation (Line(points={{-309,160},{280,160},{280,60},{272,60}},color={0,0,127}));
   annotation (
     __Dymola_Commands(
-      file="modelica://Buildings/Resources/Scripts/Dymola/Experimental/DHC/EnergyTransferStations/Combined/Validation/ChillerOnly.mos" "Simulate and plot"),
+      file="modelica://Buildings/Resources/Scripts/Dymola/DHC/ETS/Combined/Validation/ChillerOnly.mos" "Simulate and plot"),
     experiment(
       StopTime=360000,
       Tolerance=1e-06),
@@ -41,8 +41,8 @@ First implementation.
       info="<html>
 <p>
 This model validates
-<a href=\"modelica://Buildings.Experimental.DHC.EnergyTransferStations.Combined.ChillerBorefield\">
-Buildings.Experimental.DHC.EnergyTransferStations.Combined.ChillerBorefield</a>
+<a href=\"modelica://Buildings.DHC.ETS.Combined.ChillerBorefield\">
+Buildings.DHC.ETS.Combined.ChillerBorefield</a>
 in a system configuration with no geothermal borefield.
 </p>
 <ul>
@@ -57,8 +57,8 @@ temperature, corresponding to typical extreme values over a whole year
 </li>
 <li>
 The other modeling assumptions are described in
-<a href=\"modelica://Buildings.Experimental.DHC.EnergyTransferStations.Combined.Validation.BaseClasses.PartialChillerBorefield\">
-Buildings.Experimental.DHC.EnergyTransferStations.Combined.Validation.BaseClasses.PartialChillerBorefield</a>.
+<a href=\"modelica://Buildings.DHC.ETS.Combined.Validation.BaseClasses.PartialChillerBorefield\">
+Buildings.DHC.ETS.Combined.Validation.BaseClasses.PartialChillerBorefield</a>.
 </li>
 </ul>
 </html>"));
diff --git a/Buildings/Experimental/DHC/EnergyTransferStations/Combined/Validation/ChillerWSE.mo b/Buildings/DHC/ETS/Combined/Validation/ChillerWSE.mo
similarity index 73%
rename from Buildings/Experimental/DHC/EnergyTransferStations/Combined/Validation/ChillerWSE.mo
rename to Buildings/DHC/ETS/Combined/Validation/ChillerWSE.mo
index 50a410fc75b..172de677256 100644
--- a/Buildings/Experimental/DHC/EnergyTransferStations/Combined/Validation/ChillerWSE.mo
+++ b/Buildings/DHC/ETS/Combined/Validation/ChillerWSE.mo
@@ -1,4 +1,4 @@
-within Buildings.Experimental.DHC.EnergyTransferStations.Combined.Validation;
+within Buildings.DHC.ETS.Combined.Validation;
 model ChillerWSE
   "Validation of the ETS model with heat recovery chiller and waterside economizer"
   extends ChillerOnly(
@@ -27,7 +27,7 @@ equation
     annotation (Line(points={{-309,160},{280,160},{280,60},{272,60}},color={0,0,127}));
   annotation (
     __Dymola_Commands(
-      file="modelica://Buildings/Resources/Scripts/Dymola/Experimental/DHC/EnergyTransferStations/Combined/Validation/ChillerWSE.mos"
+      file="modelica://Buildings/Resources/Scripts/Dymola/DHC/ETS/Combined/Validation/ChillerWSE.mos"
       "Simulate and plot"),
     experiment(
       StopTime=360000,
@@ -44,8 +44,8 @@ First implementation.
       info="<html>
 <p>
 This model validates
-<a href=\"modelica://Buildings.Experimental.DHC.EnergyTransferStations.Combined.ChillerBorefield\">
-Buildings.Experimental.DHC.EnergyTransferStations.Combined.ChillerBorefield</a>
+<a href=\"modelica://Buildings.DHC.ETS.Combined.ChillerBorefield\">
+Buildings.DHC.ETS.Combined.ChillerBorefield</a>
 in a system configuration with no geothermal borefield.
 </p>
 <ul>
@@ -60,8 +60,8 @@ temperature, corresponding to typical extreme values over a whole year
 </li>
 <li>
 The other modeling assumptions are described in
-<a href=\"modelica://Buildings.Experimental.DHC.EnergyTransferStations.Combined.Validation.BaseClasses.PartialChillerBorefield\">
-Buildings.Experimental.DHC.EnergyTransferStations.Combined.Validation.BaseClasses.PartialChillerBorefield</a>.
+<a href=\"modelica://Buildings.DHC.ETS.Combined.Validation.BaseClasses.PartialChillerBorefield\">
+Buildings.DHC.ETS.Combined.Validation.BaseClasses.PartialChillerBorefield</a>.
 </li>
 </ul>
 </html>"));
diff --git a/Buildings/Experimental/DHC/Loads/BaseClasses/Controls/Validation/package.mo b/Buildings/DHC/ETS/Combined/Validation/package.mo
similarity index 57%
rename from Buildings/Experimental/DHC/Loads/BaseClasses/Controls/Validation/package.mo
rename to Buildings/DHC/ETS/Combined/Validation/package.mo
index 1fe7dfa9ec3..f71dbd516c1 100644
--- a/Buildings/Experimental/DHC/Loads/BaseClasses/Controls/Validation/package.mo
+++ b/Buildings/DHC/ETS/Combined/Validation/package.mo
@@ -1,4 +1,4 @@
-within Buildings.Experimental.DHC.Loads.BaseClasses.Controls;
+within Buildings.DHC.ETS.Combined;
 package Validation "Collection of validation models"
   extends Modelica.Icons.ExamplesPackage;
 
@@ -8,8 +8,8 @@ package Validation "Collection of validation models"
       info="<html>
 <p>
 This package contains validation models for the classes in
-<a href=\"modelica://Buildings.Experimental.DHC.Loads.BaseClasses.Controls\">
-Buildings.Experimental.DHC.Loads.BaseClasses.Controls</a>.
+<a href=\"modelica://Buildings.DHC.ETS.Combined\">
+Buildings.DHC.ETS.Combined</a>.
 </p>
 </html>"));
 end Validation;
diff --git a/Buildings/Experimental/DHC/EnergyTransferStations/Combined/Validation/package.order b/Buildings/DHC/ETS/Combined/Validation/package.order
similarity index 100%
rename from Buildings/Experimental/DHC/EnergyTransferStations/Combined/Validation/package.order
rename to Buildings/DHC/ETS/Combined/Validation/package.order
diff --git a/Buildings/Experimental/DHC/EnergyTransferStations/Combined/package.mo b/Buildings/DHC/ETS/Combined/package.mo
similarity index 85%
rename from Buildings/Experimental/DHC/EnergyTransferStations/Combined/package.mo
rename to Buildings/DHC/ETS/Combined/package.mo
index 6aa1f50941c..5fe43202392 100644
--- a/Buildings/Experimental/DHC/EnergyTransferStations/Combined/package.mo
+++ b/Buildings/DHC/ETS/Combined/package.mo
@@ -1,4 +1,4 @@
-within Buildings.Experimental.DHC.EnergyTransferStations;
+within Buildings.DHC.ETS;
 package Combined "Package of models for DHC energy transfer stations"
   extends Modelica.Icons.VariantsPackage;
 
diff --git a/Buildings/Experimental/DHC/EnergyTransferStations/Combined/package.order b/Buildings/DHC/ETS/Combined/package.order
similarity index 100%
rename from Buildings/Experimental/DHC/EnergyTransferStations/Combined/package.order
rename to Buildings/DHC/ETS/Combined/package.order
diff --git a/Buildings/Experimental/DHC/EnergyTransferStations/Cooling/Direct.mo b/Buildings/DHC/ETS/Cooling/Direct.mo
similarity index 93%
rename from Buildings/Experimental/DHC/EnergyTransferStations/Cooling/Direct.mo
rename to Buildings/DHC/ETS/Cooling/Direct.mo
index 94406a2cab9..bc10ac4284c 100644
--- a/Buildings/Experimental/DHC/EnergyTransferStations/Cooling/Direct.mo
+++ b/Buildings/DHC/ETS/Cooling/Direct.mo
@@ -1,9 +1,9 @@
-within Buildings.Experimental.DHC.EnergyTransferStations.Cooling;
+within Buildings.DHC.ETS.Cooling;
 model Direct "Direct cooling ETS model for district energy systems with in-building
   pumping and deltaT control"
   extends
-    Buildings.Experimental.DHC.EnergyTransferStations.BaseClasses.PartialDirect(
-      final typ=Buildings.Experimental.DHC.Types.DistrictSystemType.Cooling,
+    Buildings.DHC.ETS.BaseClasses.PartialDirect(
+      final typ=Buildings.DHC.Types.DistrictSystemType.Cooling,
       final have_chiWat=true,
       final have_heaWat=false,
       con(reverseActing=false),
@@ -31,7 +31,7 @@ cooling network is at or above the minimum specified value. This configuration
 naturally results in a fluctuating building supply tempearture.
 </p>
 <p align=\"center\">
-<img src=\"modelica://Buildings/Resources/Images/Experimental/DHC/EnergyTransferStations/Cooling/Direct.png\" alt=\"DC ETS Direct\"/>
+<img src=\"modelica://Buildings/Resources/Images/DHC/ETS/Cooling/Direct.png\" alt=\"DC ETS Direct\"/>
 </p>
 <h4>
 Reference
@@ -55,7 +55,7 @@ This is for <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/3389\
 </li>
 <li>
 April 7, 2023, by David Blum:<br/>
-Change to extend from <code>Buildings.Experimental.DHC.EnergyTransferStations.BaseClasses.PartialDirect</code>.
+Change to extend from <code>Buildings.DHC.ETS.BaseClasses.PartialDirect</code>.
 </li>
 <li>
 January 11, 2023, by Michael Wetter:<br/>
diff --git a/Buildings/Experimental/DHC/EnergyTransferStations/Cooling/Examples/Direct.mo b/Buildings/DHC/ETS/Cooling/Examples/Direct.mo
similarity index 95%
rename from Buildings/Experimental/DHC/EnergyTransferStations/Cooling/Examples/Direct.mo
rename to Buildings/DHC/ETS/Cooling/Examples/Direct.mo
index 904a2a21f26..609665a51ae 100644
--- a/Buildings/Experimental/DHC/EnergyTransferStations/Cooling/Examples/Direct.mo
+++ b/Buildings/DHC/ETS/Cooling/Examples/Direct.mo
@@ -1,4 +1,4 @@
-within Buildings.Experimental.DHC.EnergyTransferStations.Cooling.Examples;
+within Buildings.DHC.ETS.Cooling.Examples;
 model Direct "Example model for direct cooling energy transfer station
   with in-building pumping and controlled district return temperature"
   extends Modelica.Icons.Example;
@@ -16,7 +16,7 @@ model Direct "Example model for direct cooling energy transfer station
       Medium.T_default,
       Medium.X_default))
     "Default specific heat capacity of medium";
-  Buildings.Experimental.DHC.EnergyTransferStations.Cooling.Direct cooETS(
+  Buildings.DHC.ETS.Cooling.Direct cooETS(
     mBui_flow_nominal=mBui_flow_nominal,
     QChiWat_flow_nominal=Q_flow_nominal,
     dpConVal_nominal=50,
@@ -133,7 +133,7 @@ equation
         preserveAspectRatio=false,
         extent={{-160,-120},{160,120}})),
     __Dymola_Commands(
-      file="modelica://Buildings/Resources/Scripts/Dymola/Experimental/DHC/EnergyTransferStations/Cooling/Examples/Direct.mos" "Simulate and plot"),
+      file="modelica://Buildings/Resources/Scripts/Dymola/DHC/ETS/Cooling/Examples/Direct.mos" "Simulate and plot"),
     experiment(
       StartTime=0,
       StopTime=86400,
diff --git a/Buildings/Experimental/DHC/EnergyTransferStations/Cooling/Examples/Indirect.mo b/Buildings/DHC/ETS/Cooling/Examples/Indirect.mo
similarity index 95%
rename from Buildings/Experimental/DHC/EnergyTransferStations/Cooling/Examples/Indirect.mo
rename to Buildings/DHC/ETS/Cooling/Examples/Indirect.mo
index bdd28cab79e..43b8c32917c 100644
--- a/Buildings/Experimental/DHC/EnergyTransferStations/Cooling/Examples/Indirect.mo
+++ b/Buildings/DHC/ETS/Cooling/Examples/Indirect.mo
@@ -1,4 +1,4 @@
-within Buildings.Experimental.DHC.EnergyTransferStations.Cooling.Examples;
+within Buildings.DHC.ETS.Cooling.Examples;
 model Indirect "Example model for indirect cooling energy transfer station
   with a closed chilled water loop on the building side"
   extends Modelica.Icons.Example;
@@ -17,7 +17,7 @@ model Indirect "Example model for indirect cooling energy transfer station
       Medium.T_default,
       Medium.X_default))
     "Default specific heat capacity of medium";
-  Buildings.Experimental.DHC.EnergyTransferStations.Cooling.Indirect cooETS(
+  Buildings.DHC.ETS.Cooling.Indirect cooETS(
     QChiWat_flow_nominal=QCoo_flow_nominal,
     mDis_flow_nominal=mBui_flow_nominal,
     mBui_flow_nominal=mBui_flow_nominal,
@@ -141,7 +141,7 @@ equation
         preserveAspectRatio=false,
         extent={{-140,-140},{140,140}})),
     __Dymola_Commands(
-      file="modelica://Buildings/Resources/Scripts/Dymola/Experimental/DHC/EnergyTransferStations/Cooling/Examples/Indirect.mos" "Simulate and plot"),
+      file="modelica://Buildings/Resources/Scripts/Dymola/DHC/ETS/Cooling/Examples/Indirect.mos" "Simulate and plot"),
     experiment(
       StartTime=0,
       StopTime=86400,
diff --git a/Buildings/Experimental/DHC/EnergyTransferStations/Heating/Examples/package.mo b/Buildings/DHC/ETS/Cooling/Examples/package.mo
similarity index 53%
rename from Buildings/Experimental/DHC/EnergyTransferStations/Heating/Examples/package.mo
rename to Buildings/DHC/ETS/Cooling/Examples/package.mo
index 4e42a7f118f..bba812aea01 100644
--- a/Buildings/Experimental/DHC/EnergyTransferStations/Heating/Examples/package.mo
+++ b/Buildings/DHC/ETS/Cooling/Examples/package.mo
@@ -1,12 +1,12 @@
-within Buildings.Experimental.DHC.EnergyTransferStations.Heating;
+within Buildings.DHC.ETS.Cooling;
 package Examples
   extends Modelica.Icons.ExamplesPackage;
 
 annotation (Documentation(revisions="<html>
 </html>", info="<html>
 <p>This package contains advanced examples illustrating the use of the models in
-<a href=\"modelica://Buildings.Experimental.DHC.EnergyTransferStations.Cooling\">
-Buildings.Experimental.DHC.EnergyTransferStations.Cooling</a>.
+<a href=\"modelica://Buildings.DHC.ETS.Cooling\">
+Buildings.DHC.ETS.Cooling</a>.
 </p>
 </html>"));
 end Examples;
diff --git a/Buildings/Experimental/DHC/EnergyTransferStations/Cooling/Examples/package.order b/Buildings/DHC/ETS/Cooling/Examples/package.order
similarity index 100%
rename from Buildings/Experimental/DHC/EnergyTransferStations/Cooling/Examples/package.order
rename to Buildings/DHC/ETS/Cooling/Examples/package.order
diff --git a/Buildings/Experimental/DHC/EnergyTransferStations/Cooling/Indirect.mo b/Buildings/DHC/ETS/Cooling/Indirect.mo
similarity index 94%
rename from Buildings/Experimental/DHC/EnergyTransferStations/Cooling/Indirect.mo
rename to Buildings/DHC/ETS/Cooling/Indirect.mo
index 1869e870278..230fcdcdb62 100644
--- a/Buildings/Experimental/DHC/EnergyTransferStations/Cooling/Indirect.mo
+++ b/Buildings/DHC/ETS/Cooling/Indirect.mo
@@ -1,10 +1,10 @@
-within Buildings.Experimental.DHC.EnergyTransferStations.Cooling;
+within Buildings.DHC.ETS.Cooling;
 model Indirect
   "Indirect cooling energy transfer station for district energy systems"
   extends
-    Buildings.Experimental.DHC.EnergyTransferStations.BaseClasses.PartialIndirect(
+    Buildings.DHC.ETS.BaseClasses.PartialIndirect(
       QChiWat_flow_nominal=-Q_flow_nominal,
-      final typ=Buildings.Experimental.DHC.Types.DistrictSystemType.Cooling,
+      final typ=Buildings.DHC.Types.DistrictSystemType.Cooling,
       final have_chiWat=true,
       final have_heaWat=false,
       Q_flow_nominal(max=0),
@@ -33,7 +33,7 @@ As shown in the figure below, the building pumping design (constant/variable)
 is specified on the building side and not within the ETS.
 </p>
 <p align=\"center\">
-<img src=\"modelica://Buildings/Resources/Images/Experimental/DHC/EnergyTransferStations/Cooling/Indirect.png\" alt=\"DHC.ETS.Indirect\"/>
+<img src=\"modelica://Buildings/Resources/Images/DHC/ETS/Cooling/Indirect.png\" alt=\"DHC.ETS.Indirect\"/>
 </p>
 <h4>Reference</h4>
 <p>
@@ -51,7 +51,7 @@ This is for <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/3606\
 </li>
 <li>
 May 30, 2023, by David Blum:<br/>
-Change to extend from <code>Buildings.Experimental.DHC.EnergyTransferStations.BaseClasses.PartialDirect</code>.
+Change to extend from <code>Buildings.DHC.ETS.BaseClasses.PartialDirect</code>.
 </li>
 <li>
 March 16, 2023, by David Blum:<br/>
diff --git a/Buildings/Experimental/DHC/EnergyTransferStations/Cooling/package.mo b/Buildings/DHC/ETS/Cooling/package.mo
similarity index 84%
rename from Buildings/Experimental/DHC/EnergyTransferStations/Cooling/package.mo
rename to Buildings/DHC/ETS/Cooling/package.mo
index 5f99f7848c0..92c85d838a3 100644
--- a/Buildings/Experimental/DHC/EnergyTransferStations/Cooling/package.mo
+++ b/Buildings/DHC/ETS/Cooling/package.mo
@@ -1,4 +1,4 @@
-within Buildings.Experimental.DHC.EnergyTransferStations;
+within Buildings.DHC.ETS;
 package Cooling "This package contains models for energy transfer stations used in district cooling systems"
   extends Modelica.Icons.VariantsPackage;
 
diff --git a/Buildings/Experimental/DHC/EnergyTransferStations/Cooling/package.order b/Buildings/DHC/ETS/Cooling/package.order
similarity index 100%
rename from Buildings/Experimental/DHC/EnergyTransferStations/Cooling/package.order
rename to Buildings/DHC/ETS/Cooling/package.order
diff --git a/Buildings/Experimental/DHC/EnergyTransferStations/Heating/Direct.mo b/Buildings/DHC/ETS/Heating/Direct.mo
similarity index 94%
rename from Buildings/Experimental/DHC/EnergyTransferStations/Heating/Direct.mo
rename to Buildings/DHC/ETS/Heating/Direct.mo
index 98e19192c35..6e32e9c52c1 100644
--- a/Buildings/Experimental/DHC/EnergyTransferStations/Heating/Direct.mo
+++ b/Buildings/DHC/ETS/Heating/Direct.mo
@@ -1,9 +1,9 @@
-within Buildings.Experimental.DHC.EnergyTransferStations.Heating;
+within Buildings.DHC.ETS.Heating;
 model Direct "Direct heating ETS model for district energy systems with in-building
   pumping and deltaT control"
   extends
-    Buildings.Experimental.DHC.EnergyTransferStations.BaseClasses.PartialDirect(
-      final typ=Buildings.Experimental.DHC.Types.DistrictSystemType.HeatingGeneration2to4,
+    Buildings.DHC.ETS.BaseClasses.PartialDirect(
+      final typ=Buildings.DHC.Types.DistrictSystemType.HeatingGeneration2to4,
       final have_chiWat=false,
       final have_heaWat=true,
       nPorts_aHeaWat=1,
@@ -30,7 +30,7 @@ heating network is at or below the maximum specified value. This configuration
 naturally results in a fluctuating building supply tempearture.
 </p>
 <p align=\"center\">
-<img src=\"modelica://Buildings/Resources/Images/Experimental/DHC/EnergyTransferStations/Cooling/Direct.png\" alt=\"DC ETS Direct\"/>
+<img src=\"modelica://Buildings/Resources/Images/DHC/ETS/Cooling/Direct.png\" alt=\"DC ETS Direct\"/>
 </p>
 <h4>
 Reference
diff --git a/Buildings/Experimental/DHC/EnergyTransferStations/Heating/Examples/Direct.mo b/Buildings/DHC/ETS/Heating/Examples/Direct.mo
similarity index 95%
rename from Buildings/Experimental/DHC/EnergyTransferStations/Heating/Examples/Direct.mo
rename to Buildings/DHC/ETS/Heating/Examples/Direct.mo
index 607023fcbb2..860b9bff801 100644
--- a/Buildings/Experimental/DHC/EnergyTransferStations/Heating/Examples/Direct.mo
+++ b/Buildings/DHC/ETS/Heating/Examples/Direct.mo
@@ -1,4 +1,4 @@
-within Buildings.Experimental.DHC.EnergyTransferStations.Heating.Examples;
+within Buildings.DHC.ETS.Heating.Examples;
 model Direct "Example model for direct heating energy transfer station
   with in-building pumping and controlled district return temperature"
   extends Modelica.Icons.Example;
@@ -16,7 +16,7 @@ model Direct "Example model for direct heating energy transfer station
       Medium.T_default,
       Medium.X_default))
     "Default specific heat capacity of medium";
-  Buildings.Experimental.DHC.EnergyTransferStations.Heating.Direct heaETS(
+  Buildings.DHC.ETS.Heating.Direct heaETS(
     mBui_flow_nominal=mBui_flow_nominal,
     QHeaWat_flow_nominal=Q_flow_nominal,
     dpConVal_nominal=50,
@@ -122,7 +122,7 @@ equation
         preserveAspectRatio=false,
         extent={{-160,-120},{160,120}})),
     __Dymola_Commands(
-      file="modelica://Buildings/Resources/Scripts/Dymola/Experimental/DHC/EnergyTransferStations/Heating/Examples/Direct.mos" "Simulate and plot"),
+      file="modelica://Buildings/Resources/Scripts/Dymola/DHC/ETS/Heating/Examples/Direct.mos" "Simulate and plot"),
     experiment(
       StartTime=0,
       StopTime=86400,
diff --git a/Buildings/Experimental/DHC/EnergyTransferStations/Heating/Examples/Indirect.mo b/Buildings/DHC/ETS/Heating/Examples/Indirect.mo
similarity index 95%
rename from Buildings/Experimental/DHC/EnergyTransferStations/Heating/Examples/Indirect.mo
rename to Buildings/DHC/ETS/Heating/Examples/Indirect.mo
index ab7c9b64286..9cdf597c506 100644
--- a/Buildings/Experimental/DHC/EnergyTransferStations/Heating/Examples/Indirect.mo
+++ b/Buildings/DHC/ETS/Heating/Examples/Indirect.mo
@@ -1,4 +1,4 @@
-within Buildings.Experimental.DHC.EnergyTransferStations.Heating.Examples;
+within Buildings.DHC.ETS.Heating.Examples;
 model Indirect "Example model for indirect heating energy transfer station
   with a closed chilled water loop on the building side"
   extends Modelica.Icons.Example;
@@ -17,7 +17,7 @@ model Indirect "Example model for indirect heating energy transfer station
       Medium.T_default,
       Medium.X_default))
     "Default specific heat capacity of medium";
-  Buildings.Experimental.DHC.EnergyTransferStations.Heating.Indirect heaETS(
+  Buildings.DHC.ETS.Heating.Indirect heaETS(
     QHeaWat_flow_nominal=QHea_flow_nominal,
     mDis_flow_nominal=mBui_flow_nominal,
     mBui_flow_nominal=mBui_flow_nominal,
@@ -130,7 +130,7 @@ equation
         preserveAspectRatio=false,
         extent={{-140,-140},{140,140}})),
     __Dymola_Commands(
-      file="modelica://Buildings/Resources/Scripts/Dymola/Experimental/DHC/EnergyTransferStations/Heating/Examples/Indirect.mos" "Simulate and plot"),
+      file="modelica://Buildings/Resources/Scripts/Dymola/DHC/ETS/Heating/Examples/Indirect.mos" "Simulate and plot"),
     experiment(
       StartTime=0,
       StopTime=86400,
diff --git a/Buildings/Experimental/DHC/EnergyTransferStations/Cooling/Examples/package.mo b/Buildings/DHC/ETS/Heating/Examples/package.mo
similarity index 53%
rename from Buildings/Experimental/DHC/EnergyTransferStations/Cooling/Examples/package.mo
rename to Buildings/DHC/ETS/Heating/Examples/package.mo
index 04e83cf74aa..ce70e5c9284 100644
--- a/Buildings/Experimental/DHC/EnergyTransferStations/Cooling/Examples/package.mo
+++ b/Buildings/DHC/ETS/Heating/Examples/package.mo
@@ -1,12 +1,12 @@
-within Buildings.Experimental.DHC.EnergyTransferStations.Cooling;
+within Buildings.DHC.ETS.Heating;
 package Examples
   extends Modelica.Icons.ExamplesPackage;
 
 annotation (Documentation(revisions="<html>
 </html>", info="<html>
 <p>This package contains advanced examples illustrating the use of the models in
-<a href=\"modelica://Buildings.Experimental.DHC.EnergyTransferStations.Cooling\">
-Buildings.Experimental.DHC.EnergyTransferStations.Cooling</a>.
+<a href=\"modelica://Buildings.DHC.ETS.Cooling\">
+Buildings.DHC.ETS.Cooling</a>.
 </p>
 </html>"));
 end Examples;
diff --git a/Buildings/Experimental/DHC/EnergyTransferStations/Heating/Examples/package.order b/Buildings/DHC/ETS/Heating/Examples/package.order
similarity index 100%
rename from Buildings/Experimental/DHC/EnergyTransferStations/Heating/Examples/package.order
rename to Buildings/DHC/ETS/Heating/Examples/package.order
diff --git a/Buildings/Experimental/DHC/EnergyTransferStations/Heating/Indirect.mo b/Buildings/DHC/ETS/Heating/Indirect.mo
similarity index 94%
rename from Buildings/Experimental/DHC/EnergyTransferStations/Heating/Indirect.mo
rename to Buildings/DHC/ETS/Heating/Indirect.mo
index 1e2eb697696..f37928061b7 100644
--- a/Buildings/Experimental/DHC/EnergyTransferStations/Heating/Indirect.mo
+++ b/Buildings/DHC/ETS/Heating/Indirect.mo
@@ -1,10 +1,10 @@
-within Buildings.Experimental.DHC.EnergyTransferStations.Heating;
+within Buildings.DHC.ETS.Heating;
 model Indirect
   "Indirect heating energy transfer station for district energy systems"
   extends
-    Buildings.Experimental.DHC.EnergyTransferStations.BaseClasses.PartialIndirect(
+    Buildings.DHC.ETS.BaseClasses.PartialIndirect(
       QHeaWat_flow_nominal=Q_flow_nominal,
-      final typ=Buildings.Experimental.DHC.Types.DistrictSystemType.HeatingGeneration2to4,
+      final typ=Buildings.DHC.Types.DistrictSystemType.HeatingGeneration2to4,
       final have_chiWat=false,
       final have_heaWat=true,
       Q_flow_nominal(min=0),
@@ -31,7 +31,7 @@ As shown in the figure below, the building pumping design (constant/variable)
 is specified on the building side and not within the ETS.
 </p>
 <p align=\"center\">
-<img src=\"modelica://Buildings/Resources/Images/Experimental/DHC/EnergyTransferStations/Cooling/Indirect.png\" alt=\"DHC.ETS.Indirect\"/>
+<img src=\"modelica://Buildings/Resources/Images/DHC/ETS/Cooling/Indirect.png\" alt=\"DHC.ETS.Indirect\"/>
 </p>
 <h4>Reference</h4>
 <p>
diff --git a/Buildings/Experimental/DHC/EnergyTransferStations/Heating/package.mo b/Buildings/DHC/ETS/Heating/package.mo
similarity index 84%
rename from Buildings/Experimental/DHC/EnergyTransferStations/Heating/package.mo
rename to Buildings/DHC/ETS/Heating/package.mo
index 1b45ff17483..6cfc44c96d9 100644
--- a/Buildings/Experimental/DHC/EnergyTransferStations/Heating/package.mo
+++ b/Buildings/DHC/ETS/Heating/package.mo
@@ -1,4 +1,4 @@
-within Buildings.Experimental.DHC.EnergyTransferStations;
+within Buildings.DHC.ETS;
 package Heating "This package contains models for energy transfer stations used in district heating systems"
   extends Modelica.Icons.VariantsPackage;
 
diff --git a/Buildings/Experimental/DHC/EnergyTransferStations/Heating/package.order b/Buildings/DHC/ETS/Heating/package.order
similarity index 100%
rename from Buildings/Experimental/DHC/EnergyTransferStations/Heating/package.order
rename to Buildings/DHC/ETS/Heating/package.order
diff --git a/Buildings/Experimental/DHC/EnergyTransferStations/Types.mo b/Buildings/DHC/ETS/Types.mo
similarity index 95%
rename from Buildings/Experimental/DHC/EnergyTransferStations/Types.mo
rename to Buildings/DHC/ETS/Types.mo
index e3ced1af201..0418ce5ca34 100644
--- a/Buildings/Experimental/DHC/EnergyTransferStations/Types.mo
+++ b/Buildings/DHC/ETS/Types.mo
@@ -1,4 +1,4 @@
-within Buildings.Experimental.DHC.EnergyTransferStations;
+within Buildings.DHC.ETS;
 package Types
   "Package with type definitions"
   extends Modelica.Icons.TypesPackage;
diff --git a/Buildings/Experimental/DHC/EnergyTransferStations/package.mo b/Buildings/DHC/ETS/package.mo
similarity index 65%
rename from Buildings/Experimental/DHC/EnergyTransferStations/package.mo
rename to Buildings/DHC/ETS/package.mo
index 143748da378..9925b5a97ca 100644
--- a/Buildings/Experimental/DHC/EnergyTransferStations/package.mo
+++ b/Buildings/DHC/ETS/package.mo
@@ -1,5 +1,5 @@
-within Buildings.Experimental.DHC;
-package EnergyTransferStations "Package of models for energy transfer stations"
+within Buildings.DHC;
+package ETS "Package of models for energy transfer stations"
   extends Modelica.Icons.VariantsPackage;
 
   annotation (
@@ -11,4 +11,4 @@ This package contains models for energy transfer stations (ETS), also called
 end user interfaces or customer/consumer interfaces.
 </p>
 </html>"));
-end EnergyTransferStations;
+end ETS;
diff --git a/Buildings/Experimental/DHC/EnergyTransferStations/package.order b/Buildings/DHC/ETS/package.order
similarity index 100%
rename from Buildings/Experimental/DHC/EnergyTransferStations/package.order
rename to Buildings/DHC/ETS/package.order
diff --git a/Buildings/Experimental/DHC/Examples/Combined/BaseClasses/BoreField.mo b/Buildings/DHC/Examples/Combined/BaseClasses/Borefield.mo
similarity index 93%
rename from Buildings/Experimental/DHC/Examples/Combined/BaseClasses/BoreField.mo
rename to Buildings/DHC/Examples/Combined/BaseClasses/Borefield.mo
index 6f3c5483284..ef9d105832e 100644
--- a/Buildings/Experimental/DHC/Examples/Combined/BaseClasses/BoreField.mo
+++ b/Buildings/DHC/Examples/Combined/BaseClasses/Borefield.mo
@@ -1,5 +1,5 @@
-within Buildings.Experimental.DHC.Examples.Combined.BaseClasses;
-model BoreField "Geothermal borefield model"
+within Buildings.DHC.Examples.Combined.BaseClasses;
+model Borefield "Geothermal borefield model"
   extends Buildings.Fluid.Geothermal.Borefields.TwoUTubes(
     final energyDynamics=Modelica.Fluid.Types.Dynamics.FixedInitial,
     final tLoaAgg(displayUnit="h") = 3600,
@@ -80,7 +80,7 @@ double U-tube parallel configuration.
 <ul>
 <li>
 January 8, 2024, by David Blum:<br/>
-Moved to <code>Buildings.Experimental.DHC.Examples.Combined.BaseClasses.BoreField</code>.
+Moved to <code>Buildings.DHC.Examples.Combined.BaseClasses.Borefield</code>.
 This is for
 <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/3628\">
 issue 3628</a>.
@@ -100,4 +100,4 @@ Added documentation.
 </li>
 </ul>
 </html>"));
-end BoreField;
+end Borefield;
diff --git a/Buildings/Experimental/DHC/Examples/Combined/BaseClasses/DesignDataSeries.mo b/Buildings/DHC/Examples/Combined/BaseClasses/DesignDataSeries.mo
similarity index 96%
rename from Buildings/Experimental/DHC/Examples/Combined/BaseClasses/DesignDataSeries.mo
rename to Buildings/DHC/Examples/Combined/BaseClasses/DesignDataSeries.mo
index 9fdcb16f0a2..288a7fa147f 100644
--- a/Buildings/Experimental/DHC/Examples/Combined/BaseClasses/DesignDataSeries.mo
+++ b/Buildings/DHC/Examples/Combined/BaseClasses/DesignDataSeries.mo
@@ -1,4 +1,4 @@
-within Buildings.Experimental.DHC.Examples.Combined.BaseClasses;
+within Buildings.DHC.Examples.Combined.BaseClasses;
 record DesignDataSeries "Record with design data for series network"
   extends Modelica.Icons.Record;
   parameter Integer nBui = 3
diff --git a/Buildings/Experimental/DHC/Examples/Combined/BaseClasses/PartialSeries.mo b/Buildings/DHC/Examples/Combined/BaseClasses/PartialSeries.mo
similarity index 94%
rename from Buildings/Experimental/DHC/Examples/Combined/BaseClasses/PartialSeries.mo
rename to Buildings/DHC/Examples/Combined/BaseClasses/PartialSeries.mo
index 5059731cd69..18a4b012532 100644
--- a/Buildings/Experimental/DHC/Examples/Combined/BaseClasses/PartialSeries.mo
+++ b/Buildings/DHC/Examples/Combined/BaseClasses/PartialSeries.mo
@@ -1,4 +1,4 @@
-within Buildings.Experimental.DHC.Examples.Combined.BaseClasses;
+within Buildings.DHC.Examples.Combined.BaseClasses;
 partial model PartialSeries "Partial model for series network"
   extends Modelica.Icons.Example;
   package Medium = Buildings.Media.Water "Medium model";
@@ -22,18 +22,18 @@ partial model PartialSeries "Partial model for series network"
     "Number of buildings connected to DHC system"
     annotation (Evaluate=true);
   inner parameter
-    Buildings.Experimental.DHC.Examples.Combined.BaseClasses.DesignDataSeries
+    Buildings.DHC.Examples.Combined.BaseClasses.DesignDataSeries
     datDes(final mCon_flow_nominal=bui.ets.mSerWat_flow_nominal, lEnd=100)
                                                                  "Design data"
     annotation (Placement(transformation(extent={{-360,220},{-340,240}})));
   // COMPONENTS
-  Buildings.Experimental.DHC.Examples.Combined.BaseClasses.BoreField borFie(
+  Buildings.DHC.Examples.Combined.BaseClasses.Borefield borFie(
       redeclare final package Medium = Medium) "Bore field" annotation (
       Placement(transformation(
         extent={{-10,-10},{10,10}},
         rotation=0,
         origin={-130,-80})));
-  Buildings.Experimental.DHC.EnergyTransferStations.BaseClasses.Pump_m_flow pumDis(
+  Buildings.DHC.ETS.BaseClasses.Pump_m_flow pumDis(
     redeclare final package Medium = Medium,
     final m_flow_nominal=datDes.mPumDis_flow_nominal,
     final allowFlowReversal=allowFlowReversalSer,
@@ -50,7 +50,7 @@ partial model PartialSeries "Partial model for series network"
         extent={{-10,-10},{10,10}},
         rotation=180,
         origin={112,-98})));
-  Buildings.Experimental.DHC.EnergyTransferStations.BaseClasses.Pump_m_flow pumSto(
+  Buildings.DHC.ETS.BaseClasses.Pump_m_flow pumSto(
     redeclare final package Medium = Medium,
     m_flow_nominal=datDes.mSto_flow_nominal)
     "Bore field pump"
@@ -58,7 +58,7 @@ partial model PartialSeries "Partial model for series network"
       extent={{10,10},{-10,-10}},
       rotation=180,
       origin={-180,-80})));
-  Buildings.Experimental.DHC.Networks.Connections.Connection1Pipe_R conPla(
+  Buildings.DHC.Networks.Connections.Connection1Pipe_R conPla(
     redeclare final package Medium = Medium,
     final mDis_flow_nominal=datDes.mPipDis_flow_nominal,
     final mCon_flow_nominal=datDes.mPla_flow_nominal,
@@ -70,7 +70,7 @@ partial model PartialSeries "Partial model for series network"
         extent={{-10,-10},{10,10}},
         rotation=90,
         origin={-80,-10})));
-  Buildings.Experimental.DHC.Networks.Connections.Connection1Pipe_R conSto(
+  Buildings.DHC.Networks.Connections.Connection1Pipe_R conSto(
     redeclare final package Medium = Medium,
     final mDis_flow_nominal=datDes.mPipDis_flow_nominal,
     final mCon_flow_nominal=datDes.mSto_flow_nominal,
@@ -82,7 +82,7 @@ partial model PartialSeries "Partial model for series network"
         extent={{-10,-10},{10,10}},
         rotation=90,
         origin={-80,-90})));
-  Buildings.Experimental.DHC.Plants.Heating.SewageHeatRecovery
+  Buildings.DHC.Plants.Heating.SewageHeatRecovery
     pla(
     redeclare final package Medium = Medium,
     final mSew_flow_nominal=datDes.mPla_flow_nominal,
@@ -116,9 +116,9 @@ partial model PartialSeries "Partial model for series network"
         rotation=90,
         origin={-80,-40})));
   replaceable
-    Buildings.Experimental.DHC.Loads.Combined.BaseClasses.PartialBuildingWithETS
+    Buildings.DHC.Loads.Combined.BaseClasses.PartialBuildingWithETS
     bui[nBui] constrainedby
-    Buildings.Experimental.DHC.Loads.Combined.BaseClasses.PartialBuildingWithETS(
+    Buildings.DHC.Loads.Combined.BaseClasses.PartialBuildingWithETS(
     bui(each final facMul=facMul),
     redeclare each final package MediumBui = Medium,
     redeclare each final package MediumSer = Medium,
@@ -171,7 +171,7 @@ partial model PartialSeries "Partial model for series network"
     annotation (Placement(transformation(extent={{220,150},{240,170}})));
  Buildings.Controls.OBC.CDL.Reals.MultiSum ETot(nin=2) "Total electric energy"
     annotation (Placement(transformation(extent={{320,150},{340,170}})));
-  Buildings.Experimental.DHC.Loads.BaseClasses.ConstraintViolation conVio(
+  Buildings.DHC.Loads.BaseClasses.ConstraintViolation conVio(
     final uMin(final unit="K", displayUnit="degC")=datDes.TLooMin,
     final uMax(final unit="K", displayUnit="degC")=datDes.TLooMax,
     final nu=3,
diff --git a/Buildings/Experimental/DHC/Examples/Combined/BaseClasses/Zurich.mo b/Buildings/DHC/Examples/Combined/BaseClasses/Zurich.mo
similarity index 71%
rename from Buildings/Experimental/DHC/Examples/Combined/BaseClasses/Zurich.mo
rename to Buildings/DHC/Examples/Combined/BaseClasses/Zurich.mo
index f7c9ef5a1ef..56af1b4ad69 100644
--- a/Buildings/Experimental/DHC/Examples/Combined/BaseClasses/Zurich.mo
+++ b/Buildings/DHC/Examples/Combined/BaseClasses/Zurich.mo
@@ -1,4 +1,4 @@
-within Buildings.Experimental.DHC.Examples.Combined.BaseClasses;
+within Buildings.DHC.Examples.Combined.BaseClasses;
 record Zurich =
   Buildings.BoundaryConditions.GroundTemperature.ClimaticConstants.Generic (
     TSurMea=282.98,
diff --git a/Buildings/Experimental/DHC/Loads/Heating/BaseClasses/package.mo b/Buildings/DHC/Examples/Combined/BaseClasses/package.mo
similarity index 63%
rename from Buildings/Experimental/DHC/Loads/Heating/BaseClasses/package.mo
rename to Buildings/DHC/Examples/Combined/BaseClasses/package.mo
index f98fecd077e..201fdb6f360 100644
--- a/Buildings/Experimental/DHC/Loads/Heating/BaseClasses/package.mo
+++ b/Buildings/DHC/Examples/Combined/BaseClasses/package.mo
@@ -1,12 +1,12 @@
-within Buildings.Experimental.DHC.Loads.Heating;
+within Buildings.DHC.Examples.Combined;
 package BaseClasses "Package with base classes that are used by multiple models"
   extends Modelica.Icons.BasesPackage;
 
 annotation (Documentation(info="<html>
 <p>
 This package contains base classes that are used to construct the classes in
-<a href=\"modelica://Buildings.Experimental.DHC.Loads.Cooling\">
-Buildings.Experimental.DHC.Loads.Cooling</a>.
+<a href=\"modelica://Buildings.DHC.Examples.Combined\">
+Buildings.DHC.Examples.Combined</a>.
 </p>
 </html>"));
 end BaseClasses;
diff --git a/Buildings/Experimental/DHC/Examples/Combined/BaseClasses/package.order b/Buildings/DHC/Examples/Combined/BaseClasses/package.order
similarity index 79%
rename from Buildings/Experimental/DHC/Examples/Combined/BaseClasses/package.order
rename to Buildings/DHC/Examples/Combined/BaseClasses/package.order
index aa4aaf6faa1..c7ee2786d7f 100644
--- a/Buildings/Experimental/DHC/Examples/Combined/BaseClasses/package.order
+++ b/Buildings/DHC/Examples/Combined/BaseClasses/package.order
@@ -1,4 +1,4 @@
-BoreField
+Borefield
 PartialSeries
 DesignDataSeries
 Zurich
diff --git a/Buildings/Experimental/DHC/Examples/Combined/SeriesConstantFlow.mo b/Buildings/DHC/Examples/Combined/SeriesConstantFlow.mo
similarity index 88%
rename from Buildings/Experimental/DHC/Examples/Combined/SeriesConstantFlow.mo
rename to Buildings/DHC/Examples/Combined/SeriesConstantFlow.mo
index 93a6d647051..80702d4b7b5 100644
--- a/Buildings/Experimental/DHC/Examples/Combined/SeriesConstantFlow.mo
+++ b/Buildings/DHC/Examples/Combined/SeriesConstantFlow.mo
@@ -1,8 +1,8 @@
-within Buildings.Experimental.DHC.Examples.Combined;
+within Buildings.DHC.Examples.Combined;
 model SeriesConstantFlow
   "Example of series connection with constant district water mass flow rate"
-  extends Buildings.Experimental.DHC.Examples.Combined.BaseClasses.PartialSeries(redeclare
-      Buildings.Experimental.DHC.Loads.Combined.BuildingTimeSeriesWithETS bui[nBui](final filNam=filNam),
+  extends Buildings.DHC.Examples.Combined.BaseClasses.PartialSeries(redeclare
+      Buildings.DHC.Loads.Combined.BuildingTimeSeriesWithETS bui[nBui](final filNam=filNam),
       datDes(
       mPumDis_flow_nominal=95,
       mPipDis_flow_nominal=95,
@@ -10,9 +10,9 @@ model SeriesConstantFlow
       epsPla=0.935),
     pumSto(dp_nominal=30000));
   parameter String filNam[nBui]={
-    "modelica://Buildings/Resources/Data/Experimental/DHC/Loads/Examples/SwissOffice_20190916.mos",
-    "modelica://Buildings/Resources/Data/Experimental/DHC/Loads/Examples/SwissResidential_20190916.mos",
-    "modelica://Buildings/Resources/Data/Experimental/DHC/Loads/Examples/SwissHospital_20190916.mos"}
+    "modelica://Buildings/Resources/Data/DHC/Loads/Examples/SwissOffice_20190916.mos",
+    "modelica://Buildings/Resources/Data/DHC/Loads/Examples/SwissResidential_20190916.mos",
+    "modelica://Buildings/Resources/Data/DHC/Loads/Examples/SwissHospital_20190916.mos"}
     "Library paths of the files with thermal loads as time series";
   Modelica.Blocks.Sources.Constant masFloMaiPum(
     k=datDes.mPumDis_flow_nominal)
@@ -71,7 +71,7 @@ equation
   Diagram(
   coordinateSystem(preserveAspectRatio=false, extent={{-360,-260},{360,260}})),
     __Dymola_Commands(
-  file="modelica://Buildings/Resources/Scripts/Dymola/Experimental/DHC/Examples/Combined/SeriesConstantFlow.mos"
+  file="modelica://Buildings/Resources/Scripts/Dymola/DHC/Examples/Combined/SeriesConstantFlow.mos"
   "Simulate and plot"),
   experiment(
       StopTime=604800,
diff --git a/Buildings/Experimental/DHC/Examples/Combined/SeriesVariableFlow.mo b/Buildings/DHC/Examples/Combined/SeriesVariableFlow.mo
similarity index 87%
rename from Buildings/Experimental/DHC/Examples/Combined/SeriesVariableFlow.mo
rename to Buildings/DHC/Examples/Combined/SeriesVariableFlow.mo
index e09ea523fb2..4c13ab59a87 100644
--- a/Buildings/Experimental/DHC/Examples/Combined/SeriesVariableFlow.mo
+++ b/Buildings/DHC/Examples/Combined/SeriesVariableFlow.mo
@@ -1,8 +1,8 @@
-within Buildings.Experimental.DHC.Examples.Combined;
+within Buildings.DHC.Examples.Combined;
 model SeriesVariableFlow
   "Example of series connection with variable district water mass flow rate"
-  extends Buildings.Experimental.DHC.Examples.Combined.BaseClasses.PartialSeries(redeclare
-      Buildings.Experimental.DHC.Loads.Combined.BuildingTimeSeriesWithETS bui[nBui](final filNam=filNam),
+  extends Buildings.DHC.Examples.Combined.BaseClasses.PartialSeries(redeclare
+      Buildings.DHC.Loads.Combined.BuildingTimeSeriesWithETS bui[nBui](final filNam=filNam),
       datDes(
       mPumDis_flow_nominal=97.3,
       mPipDis_flow_nominal=69.5,
@@ -10,9 +10,9 @@ model SeriesVariableFlow
       epsPla=0.91),
     pumSto(dp_nominal=30000));
   parameter String filNam[nBui]={
-    "modelica://Buildings/Resources/Data/Experimental/DHC/Loads/Examples/SwissOffice_20190916.mos",
-    "modelica://Buildings/Resources/Data/Experimental/DHC/Loads/Examples/SwissResidential_20190916.mos",
-    "modelica://Buildings/Resources/Data/Experimental/DHC/Loads/Examples/SwissHospital_20190916.mos"}
+    "modelica://Buildings/Resources/Data/DHC/Loads/Examples/SwissOffice_20190916.mos",
+    "modelica://Buildings/Resources/Data/DHC/Loads/Examples/SwissResidential_20190916.mos",
+    "modelica://Buildings/Resources/Data/DHC/Loads/Examples/SwissHospital_20190916.mos"}
     "Library paths of the files with thermal loads as time series";
   Modelica.Blocks.Sources.Constant masFloDisPla(
     k=datDes.mPla_flow_nominal)
@@ -26,7 +26,7 @@ model SeriesVariableFlow
     k=fill(15 + 273.15, nBui))
     "Cold water temperature"
     annotation (Placement(transformation(extent={{-322,150},{-302,170}})));
-  Buildings.Experimental.DHC.Networks.Controls.MainPump1Pipe conPum(
+  Buildings.DHC.Networks.Controls.MainPump1Pipe conPum(
     nMix=nBui,
     nSou=2,
     nBui=nBui,
@@ -96,7 +96,7 @@ equation
   Diagram(
   coordinateSystem(preserveAspectRatio=false, extent={{-360,-260},{360,260}})),
     __Dymola_Commands(
-  file="modelica://Buildings/Resources/Scripts/Dymola/Experimental/DHC/Examples/Combined/SeriesVariableFlow.mos"
+  file="modelica://Buildings/Resources/Scripts/Dymola/DHC/Examples/Combined/SeriesVariableFlow.mos"
   "Simulate and plot"),
   experiment(
       StopTime=604800,
@@ -124,8 +124,8 @@ Added documentation.
 </html>", info="<html>
 <p>
 This model is identical to
-<a href=\"modelica://Buildings.Experimental.DHC.Examples.Combined.SeriesConstantFlow\">
-Buildings.Experimental.DHC.Examples.Combined.SeriesConstantFlow</a>
+<a href=\"modelica://Buildings.DHC.Examples.Combined.SeriesConstantFlow\">
+Buildings.DHC.Examples.Combined.SeriesConstantFlow</a>
 except for the pipe diameter and the control of the main circulation pump.
 Rather than having a constant mass flow rate, the mass flow rate is varied
 based on the mixing temperatures after each agent.
diff --git a/Buildings/Experimental/DHC/Examples/Combined/SeriesVariableFlowAgentControl.mo b/Buildings/DHC/Examples/Combined/SeriesVariableFlowAgentControl.mo
similarity index 91%
rename from Buildings/Experimental/DHC/Examples/Combined/SeriesVariableFlowAgentControl.mo
rename to Buildings/DHC/Examples/Combined/SeriesVariableFlowAgentControl.mo
index 05621272660..19a484251fa 100644
--- a/Buildings/Experimental/DHC/Examples/Combined/SeriesVariableFlowAgentControl.mo
+++ b/Buildings/DHC/Examples/Combined/SeriesVariableFlowAgentControl.mo
@@ -1,8 +1,8 @@
-within Buildings.Experimental.DHC.Examples.Combined;
+within Buildings.DHC.Examples.Combined;
 model SeriesVariableFlowAgentControl
   "Example of series connection with variable district water mass flow rate with updated agent controller"
-  extends Buildings.Experimental.DHC.Examples.Combined.BaseClasses.PartialSeries(redeclare
-      Buildings.Experimental.DHC.Loads.Combined.BuildingTimeSeriesWithETS bui[nBui](final filNam=filNam),
+  extends Buildings.DHC.Examples.Combined.BaseClasses.PartialSeries(redeclare
+      Buildings.DHC.Loads.Combined.BuildingTimeSeriesWithETS bui[nBui](final filNam=filNam),
       datDes(
       mPumDis_flow_nominal=97.3,
       mPipDis_flow_nominal=69.5,
@@ -13,9 +13,9 @@ model SeriesVariableFlowAgentControl
       epsPla=0.91),
     pumSto(dp_nominal=40000));
   parameter String filNam[nBui]={
-    "modelica://Buildings/Resources/Data/Experimental/DHC/Loads/Examples/SwissOffice_20190916.mos",
-    "modelica://Buildings/Resources/Data/Experimental/DHC/Loads/Examples/SwissResidential_20190916.mos",
-    "modelica://Buildings/Resources/Data/Experimental/DHC/Loads/Examples/SwissHospital_20190916.mos"}
+    "modelica://Buildings/Resources/Data/DHC/Loads/Examples/SwissOffice_20190916.mos",
+    "modelica://Buildings/Resources/Data/DHC/Loads/Examples/SwissResidential_20190916.mos",
+    "modelica://Buildings/Resources/Data/DHC/Loads/Examples/SwissHospital_20190916.mos"}
     "Library paths of the files with thermal loads as time series";
   parameter Modelica.Units.SI.Length diameter=sqrt(4*datDes.mPipDis_flow_nominal/1000/1.5/Modelica.Constants.pi)
     "Pipe diameter (without insulation)";
@@ -35,7 +35,7 @@ model SeriesVariableFlowAgentControl
     k=fill(15 + 273.15, nBui))
     "Cold water temperature"
     annotation (Placement(transformation(extent={{-344,150},{-324,170}})));
-  Buildings.Experimental.DHC.Networks.Controls.MainPump1Pipe conPum(
+  Buildings.DHC.Networks.Controls.MainPump1Pipe conPum(
     nMix=nBui,
     nSou=2,
     nBui=nBui,
@@ -79,7 +79,7 @@ model SeriesVariableFlowAgentControl
       each c=1000,
       each d=2600))
     annotation (Placement(transformation(extent={{-10,100},{12,80}})));
-  Buildings.Experimental.DHC.Networks.Controls.AgentPump1Pipe pumPlantControlNsew(
+  Buildings.DHC.Networks.Controls.AgentPump1Pipe pumPlantControlNsew(
     yPumMin=0,
     dToff=0.5,
     k=0.8,
@@ -87,7 +87,7 @@ model SeriesVariableFlowAgentControl
     uLowHea=0.75,
     uHighHea=1.5,
     h=0.5) annotation (Placement(transformation(extent={{-280,-10},{-260,10}})));
-  Buildings.Experimental.DHC.Networks.Controls.AgentPump1Pipe pumPlantControlNsewSto(
+  Buildings.DHC.Networks.Controls.AgentPump1Pipe pumPlantControlNsewSto(
     yPumMin=0,
     dToff=0.45,
     k=1.1,
@@ -233,7 +233,7 @@ equation
   Diagram(
   coordinateSystem(preserveAspectRatio=false, extent={{-400,-260},{400,260}})),
     __Dymola_Commands(
-  file="modelica://Buildings/Resources/Scripts/Dymola/Experimental/DHC/Examples/Combined/SeriesVariableFlowAgentControl.mos"
+  file="modelica://Buildings/Resources/Scripts/Dymola/DHC/Examples/Combined/SeriesVariableFlowAgentControl.mos"
   "Simulate and plot"),
   experiment(
       StopTime=604800,
@@ -248,8 +248,8 @@ First implementation.
 </html>", info="<html>
 <p>
 This model is an updated version of
-<a href=\"modelica://Buildings.Experimental.DHC.Examples.Combined.SeriesVariableFlow\">
-Buildings.Experimental.DHC.Examples.Combined.SeriesVariableFlow</a>.
+<a href=\"modelica://Buildings.DHC.Examples.Combined.SeriesVariableFlow\">
+Buildings.DHC.Examples.Combined.SeriesVariableFlow</a>.
 In particular the following have been updated:
 </p>
 <ul>
@@ -260,8 +260,8 @@ The sewage water temperature, mass flow rate and ground temperature are not cons
 The distribution network pripes now use the plug-flow model to add transport delay and ground coupling to the distribution network.
 </li>
 <li>
-The borefield and sewagre heat exchanger circulation pumps are controlled by an agent specific controller <a href=\"modelica://Buildings.Experimental.DHC.Networks.Controls.AgentPump1Pipe\">
-Buildings.Experimental.DHC.Networks.Controls.AgentPump1Pipe</a>.
+The borefield and sewagre heat exchanger circulation pumps are controlled by an agent specific controller <a href=\"modelica://Buildings.DHC.Networks.Controls.AgentPump1Pipe\">
+Buildings.DHC.Networks.Controls.AgentPump1Pipe</a>.
 </li>
 </ul>
 
diff --git a/Buildings/Experimental/DHC/Examples/Combined/package.mo b/Buildings/DHC/Examples/Combined/package.mo
similarity index 87%
rename from Buildings/Experimental/DHC/Examples/Combined/package.mo
rename to Buildings/DHC/Examples/Combined/package.mo
index 8e6969caed3..a5f9baef931 100644
--- a/Buildings/Experimental/DHC/Examples/Combined/package.mo
+++ b/Buildings/DHC/Examples/Combined/package.mo
@@ -1,4 +1,4 @@
-within Buildings.Experimental.DHC.Examples;
+within Buildings.DHC.Examples;
 package Combined "Package of example models for DHC systems"
   extends Modelica.Icons.VariantsPackage;
 
diff --git a/Buildings/Experimental/DHC/Examples/Combined/package.order b/Buildings/DHC/Examples/Combined/package.order
similarity index 100%
rename from Buildings/Experimental/DHC/Examples/Combined/package.order
rename to Buildings/DHC/Examples/Combined/package.order
diff --git a/Buildings/Experimental/DHC/Examples/Cooling/ElectricChillersDirectETS.mo b/Buildings/DHC/Examples/Cooling/ElectricChillersDirectETS.mo
similarity index 89%
rename from Buildings/Experimental/DHC/Examples/Cooling/ElectricChillersDirectETS.mo
rename to Buildings/DHC/Examples/Cooling/ElectricChillersDirectETS.mo
index c8aa611e2d0..fa879571d2a 100644
--- a/Buildings/Experimental/DHC/Examples/Cooling/ElectricChillersDirectETS.mo
+++ b/Buildings/DHC/Examples/Cooling/ElectricChillersDirectETS.mo
@@ -1,4 +1,4 @@
-within Buildings.Experimental.DHC.Examples.Cooling;
+within Buildings.DHC.Examples.Cooling;
 model ElectricChillersDirectETS "Example model for district cooling system with
   an electric chiller plant and a direct controlled ETS at each building"
   extends Modelica.Icons.Example;
@@ -46,13 +46,13 @@ model ElectricChillersDirectETS "Example model for district cooling system with
     "Nominal mass flow rate in each connection line";
   // Buildings
   parameter String filNam[nLoa]={
-   Modelica.Utilities.Files.loadResource("modelica://Buildings/Resources/Data/Experimental/DHC/Loads/Examples/MediumOffice-90.1-2010-5A.mos"),
-   Modelica.Utilities.Files.loadResource("modelica://Buildings/Resources/Data/Experimental/DHC/Loads/Examples/MediumOffice-90.1-2010-5A.mos"),
-   Modelica.Utilities.Files.loadResource("modelica://Buildings/Resources/Data/Experimental/DHC/Loads/Examples/MediumOffice-90.1-2010-5A.mos")}
+   Modelica.Utilities.Files.loadResource("modelica://Buildings/Resources/Data/DHC/Loads/Examples/MediumOffice-90.1-2010-5A.mos"),
+   Modelica.Utilities.Files.loadResource("modelica://Buildings/Resources/Data/DHC/Loads/Examples/MediumOffice-90.1-2010-5A.mos"),
+   Modelica.Utilities.Files.loadResource("modelica://Buildings/Resources/Data/DHC/Loads/Examples/MediumOffice-90.1-2010-5A.mos")}
     "Library path of the file with thermal loads as time series"
     annotation (Dialog(group="Buildings"));
   final parameter Modelica.Units.SI.HeatFlowRate QCoo_flow_nominal[nLoa](
-    each max=-Modelica.Constants.eps)={Buildings.Experimental.DHC.Loads.BaseClasses.getPeakLoad(
+    each max=-Modelica.Constants.eps)={Buildings.DHC.Loads.BaseClasses.getPeakLoad(
     string="#Peak space cooling load",
     filNam=filNam[i]) for i in 1:nLoa}
     "Space cooling design load (<=0)";
@@ -60,7 +60,7 @@ model ElectricChillersDirectETS "Example model for district cooling system with
     each final min=0,
     each final start=0.5)={-QCoo_flow_nominal[i]/(cp*buiETS[i].dT_nominal) for i in 1:nLoa}
     "Nominal mass flow rate of building cooling side";
-  Buildings.Experimental.DHC.Plants.Cooling.ElectricChillerParallel pla(
+  Buildings.DHC.Plants.Cooling.ElectricChillerParallel pla(
     perChi=perChi,
     dTApp=3,
     perCHWPum=perCHWPum,
@@ -94,7 +94,7 @@ model ElectricChillersDirectETS "Example model for district cooling system with
   Modelica.Blocks.Sources.Constant TCHWSupSet(k=273.15+7)
     "Chilled water supply temperature setpoint"
     annotation (Placement(transformation(extent={{0,-60},{20,-40}})));
-  Buildings.Experimental.DHC.Networks.Distribution2PipePlugFlow_v dis(
+  Buildings.DHC.Networks.Distribution2PipePlugFlow_v dis(
     redeclare final package Medium = Medium,
     nCon=nLoa,
     allowFlowReversal=false,
@@ -104,7 +104,7 @@ model ElectricChillersDirectETS "Example model for district cooling system with
     lDis=fill(30, nLoa),
     lEnd=30) "Distribution network for district cooling system"
     annotation (Placement(transformation(extent={{100,-20},{140,0}})));
-  Buildings.Experimental.DHC.Loads.Cooling.BuildingTimeSeriesWithETS buiETS[nLoa](
+  Buildings.DHC.Loads.Cooling.BuildingTimeSeriesWithETS buiETS[nLoa](
     each yMin=0.05,
     each use_inputFilter=true,
     filNam=filNam,
@@ -187,7 +187,7 @@ equation
       coordinateSystem(
       preserveAspectRatio=false, extent={{-180,-100},{180,100}})),
     __Dymola_Commands(
-      file="modelica://Buildings/Resources/Scripts/Dymola/Experimental/DHC/Examples/Cooling/ElectricChillersDirectETS.mos" "Simulate and plot"),
+      file="modelica://Buildings/Resources/Scripts/Dymola/DHC/Examples/Cooling/ElectricChillersDirectETS.mos" "Simulate and plot"),
     experiment(
       StartTime=15724800,
       StopTime=16329600,
@@ -196,18 +196,18 @@ equation
 <p>
 This model illustrates an example of district cooling system,
 consisting of a cooling plant with parallel electric chillers
-(<a href=\"modelica://Buildings.Experimental.DHC.Plants.Cooling.ElectricChillerParallel\">
-Buildings.Experimental.DHC.Plants.Cooling.ElectricChillerParallel</a>),
-a two-pipe distribution network with plug flow pipes (<a href=\"modelica://Buildings.Experimental.DHC.Networks.Distribution2PipePlugFlow_v\">
-Buildings.Experimental.DHC.Networks.Distribution2PipePlugFlow_v</a>),
+(<a href=\"modelica://Buildings.DHC.Plants.Cooling.ElectricChillerParallel\">
+Buildings.DHC.Plants.Cooling.ElectricChillerParallel</a>),
+a two-pipe distribution network with plug flow pipes (<a href=\"modelica://Buildings.DHC.Networks.Distribution2PipePlugFlow_v\">
+Buildings.DHC.Networks.Distribution2PipePlugFlow_v</a>),
 and time series building load that have directly connected ETS
 with the chilled water return temperatures controlled above a minimum
 threshold
-(<a href=\"modelica://Buildings.Experimental.DHC.Loads.Cooling.BuildingTimeSeriesWithETS\">
-Buildings.Experimental.DHC.Loads.Cooling.BuildingTimeSeriesWithETS</a>).
+(<a href=\"modelica://Buildings.DHC.Loads.Cooling.BuildingTimeSeriesWithETS\">
+Buildings.DHC.Loads.Cooling.BuildingTimeSeriesWithETS</a>).
 This configuration is illustrated in the schematic below.
 </p>
-<p align=\"center\"><img src=\"modelica://Buildings/Resources/Images/Experimental/DHC/Examples/Cooling/ElectricChillersDirectETS.png\" alt=\"DC Schematic\"/></p>
+<p align=\"center\"><img src=\"modelica://Buildings/Resources/Images/DHC/Examples/Cooling/ElectricChillersDirectETS.png\" alt=\"DC Schematic\"/></p>
 </html>", revisions="<html>
 <ul>
 <li>
diff --git a/Buildings/Experimental/DHC/Examples/Cooling/package.mo b/Buildings/DHC/Examples/Cooling/package.mo
similarity index 86%
rename from Buildings/Experimental/DHC/Examples/Cooling/package.mo
rename to Buildings/DHC/Examples/Cooling/package.mo
index c2f03efa39a..b53e28f27da 100644
--- a/Buildings/Experimental/DHC/Examples/Cooling/package.mo
+++ b/Buildings/DHC/Examples/Cooling/package.mo
@@ -1,4 +1,4 @@
-within Buildings.Experimental.DHC.Examples;
+within Buildings.DHC.Examples;
 package Cooling "Example model for entire district cooling system"
   extends Modelica.Icons.VariantsPackage;
 
diff --git a/Buildings/Experimental/DHC/Examples/Cooling/package.order b/Buildings/DHC/Examples/Cooling/package.order
similarity index 100%
rename from Buildings/Experimental/DHC/Examples/Cooling/package.order
rename to Buildings/DHC/Examples/Cooling/package.order
diff --git a/Buildings/Experimental/DHC/Examples/Steam/SingleBoiler.mo b/Buildings/DHC/Examples/Steam/SingleBoiler.mo
similarity index 93%
rename from Buildings/Experimental/DHC/Examples/Steam/SingleBoiler.mo
rename to Buildings/DHC/Examples/Steam/SingleBoiler.mo
index 1d1016eda05..a9e9d5d392d 100644
--- a/Buildings/Experimental/DHC/Examples/Steam/SingleBoiler.mo
+++ b/Buildings/DHC/Examples/Steam/SingleBoiler.mo
@@ -1,4 +1,4 @@
-within Buildings.Experimental.DHC.Examples.Steam;
+within Buildings.DHC.Examples.Steam;
 model SingleBoiler "Example model for a complete steam district heating system with a
   central plant that contains a single boiler"
   extends Modelica.Icons.Example;
@@ -40,7 +40,7 @@ model SingleBoiler "Example model for a complete steam district heating system w
   parameter Modelica.Units.SI.PressureDifference dp_nominal=6000
     "Pressure drop of distribution at nominal mass flow rate";
 
-  Buildings.Experimental.DHC.Loads.Steam.BuildingTimeSeriesAtETS bld[N](
+  Buildings.DHC.Loads.Steam.BuildingTimeSeriesAtETS bld[N](
     redeclare final package MediumSte = MediumSte,
     redeclare final package MediumWat = MediumWat,
     each have_prv=true,
@@ -57,7 +57,7 @@ model SingleBoiler "Example model for a complete steam district heating system w
     each show_T=true)
     "Buildings"
     annotation (Placement(transformation(extent={{60,20},{40,40}})));
-  Buildings.Experimental.DHC.Networks.Steam.DistributionCondensatePipe dis(
+  Buildings.DHC.Networks.Steam.DistributionCondensatePipe dis(
     redeclare final package MediumSup = MediumSte,
     redeclare final package MediumRet = MediumWat,
     final dp_nominal=dp_nominal,
@@ -66,7 +66,7 @@ model SingleBoiler "Example model for a complete steam district heating system w
     final mCon_flow_nominal=bld.m_flow_nominal)
     "Distribution network"
     annotation (Placement(transformation(extent={{0,-20},{40,0}})));
-  Buildings.Experimental.DHC.Plants.Steam.SingleBoiler pla(
+  Buildings.DHC.Plants.Steam.SingleBoiler pla(
     redeclare final package Medium = MediumWat,
     redeclare final package MediumHea_b = MediumSte,
     final m_flow_nominal=mDis_flow_nominal,
@@ -93,7 +93,7 @@ equation
   annotation (Icon(coordinateSystem(preserveAspectRatio=false)), Diagram(
         coordinateSystem(preserveAspectRatio=false)),
       __Dymola_Commands(file=
-    "modelica://Buildings/Resources/Scripts/Dymola/Experimental/DHC/Examples/Steam/SingleBoiler.mos"
+    "modelica://Buildings/Resources/Scripts/Dymola/DHC/Examples/Steam/SingleBoiler.mos"
     "Simulate and plot"),
     experiment(
       StopTime=86400,
diff --git a/Buildings/Experimental/DHC/Examples/Steam/package.mo b/Buildings/DHC/Examples/Steam/package.mo
similarity index 85%
rename from Buildings/Experimental/DHC/Examples/Steam/package.mo
rename to Buildings/DHC/Examples/Steam/package.mo
index b2583af6600..94d8252504a 100644
--- a/Buildings/Experimental/DHC/Examples/Steam/package.mo
+++ b/Buildings/DHC/Examples/Steam/package.mo
@@ -1,4 +1,4 @@
-within Buildings.Experimental.DHC.Examples;
+within Buildings.DHC.Examples;
 package Steam "Package of example models for steam district heating systems"
   extends Modelica.Icons.VariantsPackage;
 
diff --git a/Buildings/Experimental/DHC/Examples/Steam/package.order b/Buildings/DHC/Examples/Steam/package.order
similarity index 100%
rename from Buildings/Experimental/DHC/Examples/Steam/package.order
rename to Buildings/DHC/Examples/Steam/package.order
diff --git a/Buildings/Experimental/DHC/Examples/package.mo b/Buildings/DHC/Examples/package.mo
similarity index 90%
rename from Buildings/Experimental/DHC/Examples/package.mo
rename to Buildings/DHC/Examples/package.mo
index 2aee309eded..0dfbe902030 100644
--- a/Buildings/Experimental/DHC/Examples/package.mo
+++ b/Buildings/DHC/Examples/package.mo
@@ -1,4 +1,4 @@
-within Buildings.Experimental.DHC;
+within Buildings.DHC;
 package Examples "Collection of cases study"
   extends Modelica.Icons.ExamplesPackage;
 
diff --git a/Buildings/Experimental/DHC/Examples/package.order b/Buildings/DHC/Examples/package.order
similarity index 100%
rename from Buildings/Experimental/DHC/Examples/package.order
rename to Buildings/DHC/Examples/package.order
diff --git a/Buildings/Experimental/DHC/Loads/BaseClasses/Examples/BaseClasses/BuildingRCZ1Valve.mo b/Buildings/DHC/Loads/BaseClasses/BuildingRCZ1Valve.mo
similarity index 95%
rename from Buildings/Experimental/DHC/Loads/BaseClasses/Examples/BaseClasses/BuildingRCZ1Valve.mo
rename to Buildings/DHC/Loads/BaseClasses/BuildingRCZ1Valve.mo
index 7ee7aa50325..66ba13d1fbb 100644
--- a/Buildings/Experimental/DHC/Loads/BaseClasses/Examples/BaseClasses/BuildingRCZ1Valve.mo
+++ b/Buildings/DHC/Loads/BaseClasses/BuildingRCZ1Valve.mo
@@ -1,7 +1,7 @@
-within Buildings.Experimental.DHC.Loads.BaseClasses.Examples.BaseClasses;
+within Buildings.DHC.Loads.BaseClasses;
 model BuildingRCZ1Valve
   "One-zone RC building model with distribution pumps and mixing valves"
-  extends Buildings.Experimental.DHC.Loads.BaseClasses.PartialBuilding(
+  extends Buildings.DHC.Loads.BaseClasses.PartialBuilding(
     redeclare package Medium=Buildings.Media.Water,
     final have_heaWat=true,
     final have_chiWat=true,
@@ -151,7 +151,7 @@ model BuildingRCZ1Valve
   Buildings.Controls.OBC.CDL.Reals.MultiSum mulSum(
     nin=2)
     annotation (Placement(transformation(extent={{240,70},{260,90}})));
-  Buildings.Experimental.DHC.Loads.BaseClasses.Examples.BaseClasses.FanCoil4Pipe terUni(
+  Buildings.DHC.Loads.BaseClasses.FanCoil4Pipe terUni(
     redeclare package Medium1=Medium,
     redeclare package Medium2=Medium2,
     QHea_flow_nominal=1000,
@@ -166,7 +166,7 @@ model BuildingRCZ1Valve
     mLoaCoo_flow_nominal=1)
     "Terminal unit"
     annotation (Placement(transformation(extent={{-160,-58},{-140,-38}})));
-  Buildings.Experimental.DHC.Loads.BaseClasses.FlowDistribution disFloHea(
+  Buildings.DHC.Loads.BaseClasses.FlowDistribution disFloHea(
     redeclare package Medium=Medium,
     m_flow_nominal=terUni.mHeaWat_flow_nominal,
     have_pum=true,
@@ -176,10 +176,10 @@ model BuildingRCZ1Valve
     nPorts_b1=1)
     "Heating water distribution system"
     annotation (Placement(transformation(extent={{-100,-110},{-80,-90}})));
-  Buildings.Experimental.DHC.Loads.BaseClasses.FlowDistribution disFloCoo(
+  Buildings.DHC.Loads.BaseClasses.FlowDistribution disFloCoo(
     redeclare package Medium=Medium,
     m_flow_nominal=terUni.mChiWat_flow_nominal,
-    typDis=Buildings.Experimental.DHC.Loads.BaseClasses.Types.DistributionType.ChilledWater,
+    typDis=Buildings.DHC.Loads.BaseClasses.Types.DistributionType.ChilledWater,
     have_pum=true,
     have_val=true,
     dp_nominal=100000,
@@ -322,15 +322,15 @@ This is a simplified one-zone building model based on a one-element
 reduced order room model.
 The corresponding heating and cooling loads are computed with a four-pipe
 fan coil unit model derived from
-<a href=\"modelica://Buildings.Experimental.DHC.Loads.BaseClasses.PartialTerminalUnit\">
-Buildings.Experimental.DHC.Loads.BaseClasses.PartialTerminalUnit</a>
+<a href=\"modelica://Buildings.DHC.Loads.BaseClasses.PartialTerminalUnit\">
+Buildings.DHC.Loads.BaseClasses.PartialTerminalUnit</a>
 and connected to the room model by means of fluid ports.
 </p>
 <p>
 The heating and chilled water distribution to the terminal units is modeled
 with an instance of
-<a href=\"modelica://Buildings.Experimental.DHC.Loads.BaseClasses.FlowDistribution\">
-Buildings.Experimental.DHC.Loads.BaseClasses.FlowDistribution</a>
+<a href=\"modelica://Buildings.DHC.Loads.BaseClasses.FlowDistribution\">
+Buildings.DHC.Loads.BaseClasses.FlowDistribution</a>
 including a mixing valve to control the supply temperature.
 </p>
 </html>",
diff --git a/Buildings/Experimental/DHC/Loads/BaseClasses/Examples/BaseClasses/BuildingRCZ6.mo b/Buildings/DHC/Loads/BaseClasses/BuildingRCZ6.mo
similarity index 88%
rename from Buildings/Experimental/DHC/Loads/BaseClasses/Examples/BaseClasses/BuildingRCZ6.mo
rename to Buildings/DHC/Loads/BaseClasses/BuildingRCZ6.mo
index d8439e73bb8..f5376cd2ee7 100644
--- a/Buildings/Experimental/DHC/Loads/BaseClasses/Examples/BaseClasses/BuildingRCZ6.mo
+++ b/Buildings/DHC/Loads/BaseClasses/BuildingRCZ6.mo
@@ -1,7 +1,7 @@
-within Buildings.Experimental.DHC.Loads.BaseClasses.Examples.BaseClasses;
+within Buildings.DHC.Loads.BaseClasses;
 model BuildingRCZ6
   "Six-zone RC building model based on URBANopt GeoJSON export, with distribution pumps"
-  extends Buildings.Experimental.DHC.Loads.BaseClasses.PartialBuilding(
+  extends Buildings.DHC.Loads.BaseClasses.PartialBuilding(
     redeclare package Medium=Buildings.Media.Water,
     final have_weaBus=true,
     final have_heaWat=true,
@@ -43,22 +43,22 @@ model BuildingRCZ6
       each displayUnit="degC"))
     "Maximum temperature set point"
     annotation (Placement(transformation(extent={{-290,190},{-270,210}})));
-  Buildings.Experimental.DHC.Loads.BaseClasses.Examples.BaseClasses.GeojsonExportRC.OfficeBuilding.Office office
+  Buildings.DHC.Loads.BaseClasses.Examples.BaseClasses.GeojsonExportRC.OfficeBuilding.Office office
     annotation (Placement(transformation(extent={{-100,-20},{-80,0}})));
-  Buildings.Experimental.DHC.Loads.BaseClasses.Examples.BaseClasses.GeojsonExportRC.OfficeBuilding.Floor floor
+  Buildings.DHC.Loads.BaseClasses.Examples.BaseClasses.GeojsonExportRC.OfficeBuilding.Floor floor
     annotation (Placement(transformation(extent={{-60,-20},{-40,0}})));
-  Buildings.Experimental.DHC.Loads.BaseClasses.Examples.BaseClasses.GeojsonExportRC.OfficeBuilding.Storage storage
+  Buildings.DHC.Loads.BaseClasses.Examples.BaseClasses.GeojsonExportRC.OfficeBuilding.Storage storage
     annotation (Placement(transformation(extent={{-20,-20},{0,0}})));
-  Buildings.Experimental.DHC.Loads.BaseClasses.Examples.BaseClasses.GeojsonExportRC.OfficeBuilding.Meeting meeting
+  Buildings.DHC.Loads.BaseClasses.Examples.BaseClasses.GeojsonExportRC.OfficeBuilding.Meeting meeting
     annotation (Placement(transformation(extent={{20,-20},{40,0}})));
-  Buildings.Experimental.DHC.Loads.BaseClasses.Examples.BaseClasses.GeojsonExportRC.OfficeBuilding.Restroom restroom
+  Buildings.DHC.Loads.BaseClasses.Examples.BaseClasses.GeojsonExportRC.OfficeBuilding.Restroom restroom
     annotation (Placement(transformation(extent={{60,-20},{80,0}})));
-  Buildings.Experimental.DHC.Loads.BaseClasses.Examples.BaseClasses.GeojsonExportRC.OfficeBuilding.ICT iCT
+  Buildings.DHC.Loads.BaseClasses.Examples.BaseClasses.GeojsonExportRC.OfficeBuilding.ICT iCT
     annotation (Placement(transformation(extent={{100,-20},{120,0}})));
   Buildings.Controls.OBC.CDL.Reals.MultiSum mulSum(
     nin=2)
     annotation (Placement(transformation(extent={{240,70},{260,90}})));
-  Buildings.Experimental.DHC.Loads.BaseClasses.Examples.BaseClasses.FanCoil4PipeHeatPorts terUni[nZon](
+  Buildings.DHC.Loads.BaseClasses.FanCoil4PipeHeatPorts terUni[nZon](
     redeclare each final package Medium1=Medium,
     redeclare each final package Medium2=Medium2,
     final facMul=facMulTerUni,
@@ -74,7 +74,7 @@ model BuildingRCZ6
     each mLoaCoo_flow_nominal=5)
     "Terminal unit"
     annotation (Placement(transformation(extent={{-200,-60},{-180,-40}})));
-  Buildings.Experimental.DHC.Loads.BaseClasses.FlowDistribution disFloHea(
+  Buildings.DHC.Loads.BaseClasses.FlowDistribution disFloHea(
     redeclare package Medium=Medium,
     m_flow_nominal=sum(
       terUni.mHeaWat_flow_nominal .* terUni.facMul),
@@ -84,11 +84,11 @@ model BuildingRCZ6
     nPorts_b1=nZon)
     "Heating water distribution system"
     annotation (Placement(transformation(extent={{-140,-110},{-120,-90}})));
-  Buildings.Experimental.DHC.Loads.BaseClasses.FlowDistribution disFloCoo(
+  Buildings.DHC.Loads.BaseClasses.FlowDistribution disFloCoo(
     redeclare package Medium=Medium,
     m_flow_nominal=sum(
       terUni.mChiWat_flow_nominal .* terUni.facMul),
-    typDis=Buildings.Experimental.DHC.Loads.BaseClasses.Types.DistributionType.ChilledWater,
+    typDis=Buildings.DHC.Loads.BaseClasses.Types.DistributionType.ChilledWater,
     have_pum=true,
     dp_nominal=100000,
     nPorts_a1=nZon,
@@ -183,8 +183,8 @@ model.
 It was generated from translating a GeoJSON model specified within the URBANopt UI.
 The heating and cooling loads are computed with a four-pipe
 fan coil unit model derived from
-<a href=\"modelica://Buildings.Experimental.DHC.Loads.BaseClasses.PartialTerminalUnit\">
-Buildings.Experimental.DHC.Loads.BaseClasses.PartialTerminalUnit</a>
+<a href=\"modelica://Buildings.DHC.Loads.BaseClasses.PartialTerminalUnit\">
+Buildings.DHC.Loads.BaseClasses.PartialTerminalUnit</a>
 and connected to the room model by means of heat ports.
 </p>
 </html>",
diff --git a/Buildings/Experimental/DHC/Loads/BaseClasses/Examples/BaseClasses/BuildingSpawnZ1.mo b/Buildings/DHC/Loads/BaseClasses/BuildingSpawnZ1.mo
similarity index 92%
rename from Buildings/Experimental/DHC/Loads/BaseClasses/Examples/BaseClasses/BuildingSpawnZ1.mo
rename to Buildings/DHC/Loads/BaseClasses/BuildingSpawnZ1.mo
index 5646bffddc5..89d4c3efa8b 100644
--- a/Buildings/Experimental/DHC/Loads/BaseClasses/Examples/BaseClasses/BuildingSpawnZ1.mo
+++ b/Buildings/DHC/Loads/BaseClasses/BuildingSpawnZ1.mo
@@ -1,7 +1,7 @@
-within Buildings.Experimental.DHC.Loads.BaseClasses.Examples.BaseClasses;
+within Buildings.DHC.Loads.BaseClasses;
 model BuildingSpawnZ1
   "One-zone EnergyPlus building model"
-  extends Buildings.Experimental.DHC.Loads.BaseClasses.PartialBuilding(
+  extends Buildings.DHC.Loads.BaseClasses.PartialBuilding(
     redeclare package Medium=Buildings.Media.Water,
     final have_heaWat=true,
     final have_chiWat=true,
@@ -59,7 +59,7 @@ model BuildingSpawnZ1
       displayUnit="degC"))
     "Maximum temperature set point"
     annotation (Placement(transformation(extent={{-280,210},{-260,230}})));
-  Buildings.Experimental.DHC.Loads.BaseClasses.Examples.BaseClasses.FanCoil4Pipe terUni(
+  Buildings.DHC.Loads.BaseClasses.FanCoil4Pipe terUni(
     redeclare package Medium1=Medium,
     redeclare package Medium2=Medium2,
     QHea_flow_nominal=2000,
@@ -74,7 +74,7 @@ model BuildingSpawnZ1
     mLoaCoo_flow_nominal=1)
     "Terminal unit"
     annotation (Placement(transformation(extent={{-160,-60},{-140,-40}})));
-  Buildings.Experimental.DHC.Loads.BaseClasses.FlowDistribution disFloHea(
+  Buildings.DHC.Loads.BaseClasses.FlowDistribution disFloHea(
     redeclare package Medium=Medium,
     m_flow_nominal=terUni.mHeaWat_flow_nominal,
     dp_nominal=100000,
@@ -82,10 +82,10 @@ model BuildingSpawnZ1
     nPorts_b1=nZon)
     "Heating water distribution system"
     annotation (Placement(transformation(extent={{-120,-130},{-100,-110}})));
-  Buildings.Experimental.DHC.Loads.BaseClasses.FlowDistribution disFloCoo(
+  Buildings.DHC.Loads.BaseClasses.FlowDistribution disFloCoo(
     redeclare package Medium=Medium,
     m_flow_nominal=terUni.mChiWat_flow_nominal,
-    typDis=Buildings.Experimental.DHC.Loads.BaseClasses.Types.DistributionType.ChilledWater,
+    typDis=Buildings.DHC.Loads.BaseClasses.Types.DistributionType.ChilledWater,
     dp_nominal=100000,
     nPorts_a1=nZon,
     nPorts_b1=nZon)
@@ -154,8 +154,8 @@ This is a simplified one-zone building model based on EnergyPlus
 building envelope model.
 The heating and cooling loads are computed with a four-pipe
 fan coil unit model derived from
-<a href=\"modelica://Buildings.Experimental.DHC.Loads.BaseClasses.PartialTerminalUnit\">
-Buildings.Experimental.DHC.Loads.BaseClasses.PartialTerminalUnit</a>
+<a href=\"modelica://Buildings.DHC.Loads.BaseClasses.PartialTerminalUnit\">
+Buildings.DHC.Loads.BaseClasses.PartialTerminalUnit</a>
 and connected to the room model by means of fluid ports.
 </p>
 </html>",
diff --git a/Buildings/Experimental/DHC/Loads/BaseClasses/Examples/BaseClasses/BuildingSpawnZ6.mo b/Buildings/DHC/Loads/BaseClasses/BuildingSpawnZ6.mo
similarity index 95%
rename from Buildings/Experimental/DHC/Loads/BaseClasses/Examples/BaseClasses/BuildingSpawnZ6.mo
rename to Buildings/DHC/Loads/BaseClasses/BuildingSpawnZ6.mo
index 143e66fc7d0..fe2aad4d55c 100644
--- a/Buildings/Experimental/DHC/Loads/BaseClasses/Examples/BaseClasses/BuildingSpawnZ6.mo
+++ b/Buildings/DHC/Loads/BaseClasses/BuildingSpawnZ6.mo
@@ -1,7 +1,7 @@
-within Buildings.Experimental.DHC.Loads.BaseClasses.Examples.BaseClasses;
+within Buildings.DHC.Loads.BaseClasses;
 model BuildingSpawnZ6
   "Six-zone EnergyPlus building model based on URBANopt GeoJSON export, with distribution pumps"
-  extends Buildings.Experimental.DHC.Loads.BaseClasses.PartialBuilding(
+  extends Buildings.DHC.Loads.BaseClasses.PartialBuilding(
     redeclare package Medium=Buildings.Media.Water,
     final have_heaWat=true,
     final have_chiWat=true,
@@ -112,7 +112,7 @@ model BuildingSpawnZ6
   Buildings.Controls.OBC.CDL.Reals.MultiSum mulSum3(
     nin=2)
     annotation (Placement(transformation(extent={{230,70},{250,90}})));
-  Buildings.Experimental.DHC.Loads.BaseClasses.Examples.BaseClasses.FanCoil4Pipe terUni[nZon](
+  Buildings.DHC.Loads.BaseClasses.FanCoil4Pipe terUni[nZon](
     redeclare each final package Medium1=Medium,
     redeclare each final package Medium2=Medium2,
     final facMul=facMulTerUni,
@@ -128,7 +128,7 @@ model BuildingSpawnZ6
     final mLoaCoo_flow_nominal=mLoa_flow_nominal)
     "Terminal unit"
     annotation (Placement(transformation(extent={{-140,-2},{-116,22}})));
-  Buildings.Experimental.DHC.Loads.BaseClasses.FlowDistribution disFloHea(
+  Buildings.DHC.Loads.BaseClasses.FlowDistribution disFloHea(
     redeclare package Medium=Medium,
     m_flow_nominal=sum(
       terUni.mHeaWat_flow_nominal .* terUni.facMul),
@@ -138,11 +138,11 @@ model BuildingSpawnZ6
     nPorts_b1=nZon)
     "Heating water distribution system"
     annotation (Placement(transformation(extent={{-200,-190},{-180,-170}})));
-  Buildings.Experimental.DHC.Loads.BaseClasses.FlowDistribution disFloCoo(
+  Buildings.DHC.Loads.BaseClasses.FlowDistribution disFloCoo(
     redeclare package Medium=Medium,
     m_flow_nominal=sum(
       terUni.mChiWat_flow_nominal .* terUni.facMul),
-    typDis=Buildings.Experimental.DHC.Loads.BaseClasses.Types.DistributionType.ChilledWater,
+    typDis=Buildings.DHC.Loads.BaseClasses.Types.DistributionType.ChilledWater,
     have_pum=true,
     dp_nominal=100000,
     nPorts_a1=nZon,
@@ -257,8 +257,8 @@ building envelope model.
 It was generated from translating a GeoJSON model specified within the URBANopt UI.
 The heating and cooling loads are computed with a four-pipe
 fan coil unit model derived from
-<a href=\"modelica://Buildings.Experimental.DHC.Loads.BaseClasses.PartialTerminalUnit\">
-Buildings.Experimental.DHC.Loads.BaseClasses.PartialTerminalUnit</a>
+<a href=\"modelica://Buildings.DHC.Loads.BaseClasses.PartialTerminalUnit\">
+Buildings.DHC.Loads.BaseClasses.PartialTerminalUnit</a>
 and connected to the room model by means of fluid ports. The <code>Attic</code> zone
 is unconditionned, with a free floating temperature.
 </p>
diff --git a/Buildings/Experimental/DHC/Loads/BaseClasses/Examples/BaseClasses/BuildingTimeSeries.mo b/Buildings/DHC/Loads/BaseClasses/BuildingTimeSeries.mo
similarity index 95%
rename from Buildings/Experimental/DHC/Loads/BaseClasses/Examples/BaseClasses/BuildingTimeSeries.mo
rename to Buildings/DHC/Loads/BaseClasses/BuildingTimeSeries.mo
index 2f684578dc4..c0bdeb56456 100644
--- a/Buildings/Experimental/DHC/Loads/BaseClasses/Examples/BaseClasses/BuildingTimeSeries.mo
+++ b/Buildings/DHC/Loads/BaseClasses/BuildingTimeSeries.mo
@@ -1,7 +1,7 @@
-within Buildings.Experimental.DHC.Loads.BaseClasses.Examples.BaseClasses;
+within Buildings.DHC.Loads.BaseClasses;
 model BuildingTimeSeries
   "Building model with heating and/or cooling loads provided as time series"
-  extends Buildings.Experimental.DHC.Loads.BaseClasses.PartialBuilding(
+  extends Buildings.DHC.Loads.BaseClasses.PartialBuilding(
     redeclare package Medium=Buildings.Media.Water,
     have_heaWat=true,
     have_chiWat=true,
@@ -94,7 +94,7 @@ model BuildingTimeSeries
 
   parameter Modelica.Units.SI.HeatFlowRate QCoo_flow_nominal(max=0)=
     if have_chiWat then
-    Buildings.Experimental.DHC.Loads.BaseClasses.getPeakLoad(string=
+    Buildings.DHC.Loads.BaseClasses.getPeakLoad(string=
     "#Peak space cooling load",
     filNam=Modelica.Utilities.Files.loadResource(filNam))
     else 0
@@ -102,7 +102,7 @@ model BuildingTimeSeries
     annotation (Dialog(group="Nominal condition", enable=have_chiWat));
   parameter Modelica.Units.SI.HeatFlowRate QHea_flow_nominal(min=0)=
     if have_heaWat then
-    Buildings.Experimental.DHC.Loads.BaseClasses.getPeakLoad(string=
+    Buildings.DHC.Loads.BaseClasses.getPeakLoad(string=
     "#Peak space heating load",
     filNam=Modelica.Utilities.Files.loadResource(filNam))
     else 0
@@ -167,10 +167,10 @@ model BuildingTimeSeries
     if have_chiWat
     "Maximum temperature set point"
     annotation (Placement(transformation(extent={{-280,210},{-260,230}})));
-  replaceable Buildings.Experimental.DHC.Loads.BaseClasses.Validation.BaseClasses.FanCoil2PipeHeating terUniHea(
+  replaceable Buildings.DHC.Loads.BaseClasses.Validation.BaseClasses.FanCoil2PipeHeating terUniHea(
     final k=k,
     final Ti=Ti) if have_heaWat
-  constrainedby Buildings.Experimental.DHC.Loads.BaseClasses.PartialTerminalUnit(
+  constrainedby Buildings.DHC.Loads.BaseClasses.PartialTerminalUnit(
     redeclare final package Medium1=Medium,
     redeclare final package Medium2=Medium2,
     final allowFlowReversal=allowFlowReversal,
@@ -183,38 +183,38 @@ model BuildingTimeSeries
     final T_aLoaHea_nominal=T_aLoaHea_nominal)
     "Heating terminal unit"
     annotation (Placement(transformation(extent={{70,-22},{90,-2}})));
-  Buildings.Experimental.DHC.Loads.BaseClasses.FlowDistribution disFloHea(
+  Buildings.DHC.Loads.BaseClasses.FlowDistribution disFloHea(
     redeclare final package Medium=Medium,
     final allowFlowReversal=allowFlowReversal,
     m_flow_nominal=mHeaWat_flow_nominal,
     have_pum=true,
-    typCtr=Buildings.Experimental.DHC.Loads.BaseClasses.Types.PumpControlType.ConstantHead,
+    typCtr=Buildings.DHC.Loads.BaseClasses.Types.PumpControlType.ConstantHead,
     dp_nominal=100000,
     nPorts_a1=1,
     nPorts_b1=1) if have_heaWat
     "Heating water distribution system"
     annotation (Placement(transformation(extent={{120,-70},{140,-50}})));
-  Buildings.Experimental.DHC.Loads.BaseClasses.FlowDistribution disFloCoo(
+  Buildings.DHC.Loads.BaseClasses.FlowDistribution disFloCoo(
     redeclare final package Medium=Medium,
     final allowFlowReversal=allowFlowReversal,
     m_flow_nominal=mChiWat_flow_nominal,
-    typDis=Buildings.Experimental.DHC.Loads.BaseClasses.Types.DistributionType.ChilledWater,
+    typDis=Buildings.DHC.Loads.BaseClasses.Types.DistributionType.ChilledWater,
     have_pum=true,
-    typCtr=Buildings.Experimental.DHC.Loads.BaseClasses.Types.PumpControlType.ConstantHead,
+    typCtr=Buildings.DHC.Loads.BaseClasses.Types.PumpControlType.ConstantHead,
     dp_nominal=100000,
     nPorts_b1=1,
     nPorts_a1=1) if have_chiWat
     "Chilled water distribution system"
     annotation (Placement(transformation(extent={{120,-270},{140,-250}})));
   replaceable
-    Buildings.Experimental.DHC.Loads.BaseClasses.Validation.BaseClasses.FanCoil2PipeCooling
+    Buildings.DHC.Loads.BaseClasses.Validation.BaseClasses.FanCoil2PipeCooling
     terUniCoo(
     final k=k,
     final Ti=Ti,
     final QEnv_flow_nominal=if have_heaWat then QHea_flow_nominal/facMulHea else -QCoo_flow_nominal/facMulCoo)
       if have_chiWat
     constrainedby
-    Buildings.Experimental.DHC.Loads.BaseClasses.PartialTerminalUnit(
+    Buildings.DHC.Loads.BaseClasses.PartialTerminalUnit(
     redeclare final package Medium1 = Medium,
     redeclare final package Medium2 = Medium2,
     final allowFlowReversal=allowFlowReversal,
diff --git a/Buildings/Experimental/DHC/Loads/BaseClasses/ConstraintViolation.mo b/Buildings/DHC/Loads/BaseClasses/ConstraintViolation.mo
similarity index 97%
rename from Buildings/Experimental/DHC/Loads/BaseClasses/ConstraintViolation.mo
rename to Buildings/DHC/Loads/BaseClasses/ConstraintViolation.mo
index 8f7361ba8cc..050e31a832b 100644
--- a/Buildings/Experimental/DHC/Loads/BaseClasses/ConstraintViolation.mo
+++ b/Buildings/DHC/Loads/BaseClasses/ConstraintViolation.mo
@@ -1,4 +1,4 @@
-within Buildings.Experimental.DHC.Loads.BaseClasses;
+within Buildings.DHC.Loads.BaseClasses;
 block ConstraintViolation
   "Block that outputs the fraction of time when a constraint is violated"
 
diff --git a/Buildings/Experimental/DHC/Loads/BaseClasses/Controls/MixingValveControl.mo b/Buildings/DHC/Loads/BaseClasses/Controls/MixingValveControl.mo
similarity index 96%
rename from Buildings/Experimental/DHC/Loads/BaseClasses/Controls/MixingValveControl.mo
rename to Buildings/DHC/Loads/BaseClasses/Controls/MixingValveControl.mo
index ddfd73e6190..952a8d259e5 100644
--- a/Buildings/Experimental/DHC/Loads/BaseClasses/Controls/MixingValveControl.mo
+++ b/Buildings/DHC/Loads/BaseClasses/Controls/MixingValveControl.mo
@@ -1,8 +1,8 @@
-within Buildings.Experimental.DHC.Loads.BaseClasses.Controls;
+within Buildings.DHC.Loads.BaseClasses.Controls;
 block MixingValveControl
   "Mixing valve controller"
   extends Modelica.Blocks.Icons.Block;
-  import Type_dis=Buildings.Experimental.DHC.Loads.BaseClasses.Types.DistributionType
+  import Type_dis=Buildings.DHC.Loads.BaseClasses.Types.DistributionType
     "Types of distribution system";
   parameter Type_dis typDis=Type_dis.HeatingWater
     "Type of distribution system"
@@ -146,8 +146,8 @@ integral part is reset whenever the change-over mode is switched.
 </ul>
 <p>
 See
-<a href=\"modelica://Buildings.Experimental.DHC.Loads.BaseClasses.Controls.Validation.MixingValveControl\">
-Buildings.Experimental.DHC.Loads.BaseClasses.Controls.Validation.MixingValveControl</a>
+<a href=\"modelica://Buildings.DHC.Loads.BaseClasses.Controls.Validation.MixingValveControl\">
+Buildings.DHC.Loads.BaseClasses.Controls.Validation.MixingValveControl</a>
 for a simulation with change-over.
 </p>
 </html>",
diff --git a/Buildings/Experimental/DHC/Loads/BaseClasses/Controls/Validation/MixingValveControl.mo b/Buildings/DHC/Loads/BaseClasses/Controls/Validation/MixingValveControl.mo
similarity index 92%
rename from Buildings/Experimental/DHC/Loads/BaseClasses/Controls/Validation/MixingValveControl.mo
rename to Buildings/DHC/Loads/BaseClasses/Controls/Validation/MixingValveControl.mo
index da49be036b0..32feac5c4f2 100644
--- a/Buildings/Experimental/DHC/Loads/BaseClasses/Controls/Validation/MixingValveControl.mo
+++ b/Buildings/DHC/Loads/BaseClasses/Controls/Validation/MixingValveControl.mo
@@ -1,4 +1,4 @@
-within Buildings.Experimental.DHC.Loads.BaseClasses.Controls.Validation;
+within Buildings.DHC.Loads.BaseClasses.Controls.Validation;
 model MixingValveControl
   "Validation of mixing valve control in change-over mode"
   extends Modelica.Icons.Example;
@@ -6,10 +6,10 @@ model MixingValveControl
     "Source side medium";
   parameter Modelica.Units.SI.MassFlowRate m_flow_nominal=1
     "Mass flow rate at nominal conditions";
-  Buildings.Experimental.DHC.Loads.BaseClasses.FlowDistribution disFlo(
+  Buildings.DHC.Loads.BaseClasses.FlowDistribution disFlo(
     redeclare package Medium=Medium,
     m_flow_nominal=m_flow_nominal,
-    typDis=Buildings.Experimental.DHC.Loads.BaseClasses.Types.DistributionType.ChangeOver,
+    typDis=Buildings.DHC.Loads.BaseClasses.Types.DistributionType.ChangeOver,
     have_pum=true,
     have_val=true,
     dp_nominal=100000,
@@ -179,11 +179,11 @@ equation
       info="<html>
 <p>
 This model validates
-<a href=\"modelica://Buildings.Experimental.DHC.Loads.BaseClasses.Controls.MixingValveControl\">
-Buildings.Experimental.DHC.Loads.BaseClasses.Controls.MixingValveControl</a>
+<a href=\"modelica://Buildings.DHC.Loads.BaseClasses.Controls.MixingValveControl\">
+Buildings.DHC.Loads.BaseClasses.Controls.MixingValveControl</a>
 (as part of
-<a href=\"modelica://Buildings.Experimental.DHC.Loads.BaseClasses.FlowDistribution\">
-Buildings.Experimental.DHC.Loads.BaseClasses.FlowDistribution</a>)
+<a href=\"modelica://Buildings.DHC.Loads.BaseClasses.FlowDistribution\">
+Buildings.DHC.Loads.BaseClasses.FlowDistribution</a>)
 in change-over mode.
 </p>
 </html>",
@@ -203,5 +203,5 @@ First implementation.
       StopTime=1000,
       Tolerance=1e-06),
     __Dymola_Commands(
-      file="modelica://Buildings/Resources/Scripts/Dymola/Experimental/DHC/Loads/BaseClasses/Controls/Validation/MixingValveControl.mos" "Simulate and plot"));
+      file="modelica://Buildings/Resources/Scripts/Dymola/DHC/Loads/BaseClasses/Controls/Validation/MixingValveControl.mos" "Simulate and plot"));
 end MixingValveControl;
diff --git a/Buildings/Experimental/DHC/EnergyTransferStations/Combined/Validation/package.mo b/Buildings/DHC/Loads/BaseClasses/Controls/Validation/package.mo
similarity index 55%
rename from Buildings/Experimental/DHC/EnergyTransferStations/Combined/Validation/package.mo
rename to Buildings/DHC/Loads/BaseClasses/Controls/Validation/package.mo
index d18031f4844..03b0d714577 100644
--- a/Buildings/Experimental/DHC/EnergyTransferStations/Combined/Validation/package.mo
+++ b/Buildings/DHC/Loads/BaseClasses/Controls/Validation/package.mo
@@ -1,4 +1,4 @@
-within Buildings.Experimental.DHC.EnergyTransferStations.Combined;
+within Buildings.DHC.Loads.BaseClasses.Controls;
 package Validation "Collection of validation models"
   extends Modelica.Icons.ExamplesPackage;
 
@@ -8,8 +8,8 @@ package Validation "Collection of validation models"
       info="<html>
 <p>
 This package contains validation models for the classes in
-<a href=\"modelica://Buildings.Experimental.DHC.EnergyTransferStations.Combined\">
-Buildings.Experimental.DHC.EnergyTransferStations.Combined</a>.
+<a href=\"modelica://Buildings.DHC.Loads.BaseClasses.Controls\">
+Buildings.DHC.Loads.BaseClasses.Controls</a>.
 </p>
 </html>"));
 end Validation;
diff --git a/Buildings/Experimental/DHC/Loads/BaseClasses/Controls/Validation/package.order b/Buildings/DHC/Loads/BaseClasses/Controls/Validation/package.order
similarity index 100%
rename from Buildings/Experimental/DHC/Loads/BaseClasses/Controls/Validation/package.order
rename to Buildings/DHC/Loads/BaseClasses/Controls/Validation/package.order
diff --git a/Buildings/Experimental/DHC/Loads/BaseClasses/Controls/package.mo b/Buildings/DHC/Loads/BaseClasses/Controls/package.mo
similarity index 85%
rename from Buildings/Experimental/DHC/Loads/BaseClasses/Controls/package.mo
rename to Buildings/DHC/Loads/BaseClasses/Controls/package.mo
index 1b3b85309a8..f7fb7ea3c9b 100644
--- a/Buildings/Experimental/DHC/Loads/BaseClasses/Controls/package.mo
+++ b/Buildings/DHC/Loads/BaseClasses/Controls/package.mo
@@ -1,4 +1,4 @@
-within Buildings.Experimental.DHC.Loads.BaseClasses;
+within Buildings.DHC.Loads.BaseClasses;
 package Controls "Package of control sequences for DHC systems"
   extends Modelica.Icons.VariantsPackage;
 
diff --git a/Buildings/Experimental/DHC/Loads/BaseClasses/Controls/package.order b/Buildings/DHC/Loads/BaseClasses/Controls/package.order
similarity index 100%
rename from Buildings/Experimental/DHC/Loads/BaseClasses/Controls/package.order
rename to Buildings/DHC/Loads/BaseClasses/Controls/package.order
diff --git a/Buildings/Experimental/DHC/Loads/BaseClasses/Examples/BaseClasses/GeojsonExportRC/OfficeBuilding/Floor.mo b/Buildings/DHC/Loads/BaseClasses/Examples/BaseClasses/GeojsonExportRC/OfficeBuilding/Floor.mo
similarity index 97%
rename from Buildings/Experimental/DHC/Loads/BaseClasses/Examples/BaseClasses/GeojsonExportRC/OfficeBuilding/Floor.mo
rename to Buildings/DHC/Loads/BaseClasses/Examples/BaseClasses/GeojsonExportRC/OfficeBuilding/Floor.mo
index e481b5c4da3..47412f4bd27 100644
--- a/Buildings/Experimental/DHC/Loads/BaseClasses/Examples/BaseClasses/GeojsonExportRC/OfficeBuilding/Floor.mo
+++ b/Buildings/DHC/Loads/BaseClasses/Examples/BaseClasses/GeojsonExportRC/OfficeBuilding/Floor.mo
@@ -1,4 +1,4 @@
-within Buildings.Experimental.DHC.Loads.BaseClasses.Examples.BaseClasses.GeojsonExportRC.OfficeBuilding;
+within Buildings.DHC.Loads.BaseClasses.Examples.BaseClasses.GeojsonExportRC.OfficeBuilding;
 model Floor
   "This is the simulation model of Floor within building OfficeBuilding"
   Buildings.BoundaryConditions.SolarIrradiation.DiffusePerez HDifTil[6](
@@ -108,7 +108,7 @@ model Floor
     extrapolation=Modelica.Blocks.Types.Extrapolation.Periodic,
     tableName="Internals",
     fileName=Modelica.Utilities.Files.loadResource(
-      "modelica://Buildings/Resources/Data/Experimental/DHC/Loads/Examples/BaseClasses/GeojsonExportRC/OfficeBuilding/InternalGains_Floor.txt"),
+      "modelica://Buildings/Resources/Data/DHC/Loads/Examples/BaseClasses/GeojsonExportRC/OfficeBuilding/InternalGains_Floor.txt"),
     columns={2,3,4})
     "Table with profiles for persons (radiative and convective) and machines (convective)"
     annotation (Placement(transformation(extent={{6,-60},{22,-44}})));
diff --git a/Buildings/Experimental/DHC/Loads/BaseClasses/Examples/BaseClasses/GeojsonExportRC/OfficeBuilding/ICT.mo b/Buildings/DHC/Loads/BaseClasses/Examples/BaseClasses/GeojsonExportRC/OfficeBuilding/ICT.mo
similarity index 97%
rename from Buildings/Experimental/DHC/Loads/BaseClasses/Examples/BaseClasses/GeojsonExportRC/OfficeBuilding/ICT.mo
rename to Buildings/DHC/Loads/BaseClasses/Examples/BaseClasses/GeojsonExportRC/OfficeBuilding/ICT.mo
index cd4ae274283..76d9e873c82 100644
--- a/Buildings/Experimental/DHC/Loads/BaseClasses/Examples/BaseClasses/GeojsonExportRC/OfficeBuilding/ICT.mo
+++ b/Buildings/DHC/Loads/BaseClasses/Examples/BaseClasses/GeojsonExportRC/OfficeBuilding/ICT.mo
@@ -1,4 +1,4 @@
-within Buildings.Experimental.DHC.Loads.BaseClasses.Examples.BaseClasses.GeojsonExportRC.OfficeBuilding;
+within Buildings.DHC.Loads.BaseClasses.Examples.BaseClasses.GeojsonExportRC.OfficeBuilding;
 model ICT
   "This is the simulation model of ICT within building OfficeBuilding"
   Buildings.BoundaryConditions.SolarIrradiation.DiffusePerez HDifTil[6](
@@ -108,7 +108,7 @@ model ICT
     extrapolation=Modelica.Blocks.Types.Extrapolation.Periodic,
     tableName="Internals",
     fileName=Modelica.Utilities.Files.loadResource(
-      "modelica://Buildings/Resources/Data/Experimental/DHC/Loads/Examples/BaseClasses/GeojsonExportRC/OfficeBuilding/InternalGains_ICT.txt"),
+      "modelica://Buildings/Resources/Data/DHC/Loads/Examples/BaseClasses/GeojsonExportRC/OfficeBuilding/InternalGains_ICT.txt"),
     columns={2,3,4})
     "Table with profiles for persons (radiative and convective) and machines (convective)"
     annotation (Placement(transformation(extent={{6,-60},{22,-44}})));
diff --git a/Buildings/Experimental/DHC/Loads/BaseClasses/Examples/BaseClasses/GeojsonExportRC/OfficeBuilding/Meeting.mo b/Buildings/DHC/Loads/BaseClasses/Examples/BaseClasses/GeojsonExportRC/OfficeBuilding/Meeting.mo
similarity index 97%
rename from Buildings/Experimental/DHC/Loads/BaseClasses/Examples/BaseClasses/GeojsonExportRC/OfficeBuilding/Meeting.mo
rename to Buildings/DHC/Loads/BaseClasses/Examples/BaseClasses/GeojsonExportRC/OfficeBuilding/Meeting.mo
index 53dca071d28..9161fe5749f 100644
--- a/Buildings/Experimental/DHC/Loads/BaseClasses/Examples/BaseClasses/GeojsonExportRC/OfficeBuilding/Meeting.mo
+++ b/Buildings/DHC/Loads/BaseClasses/Examples/BaseClasses/GeojsonExportRC/OfficeBuilding/Meeting.mo
@@ -1,4 +1,4 @@
-within Buildings.Experimental.DHC.Loads.BaseClasses.Examples.BaseClasses.GeojsonExportRC.OfficeBuilding;
+within Buildings.DHC.Loads.BaseClasses.Examples.BaseClasses.GeojsonExportRC.OfficeBuilding;
 model Meeting
   "This is the simulation model of Meeting within building OfficeBuilding"
   Buildings.BoundaryConditions.SolarIrradiation.DiffusePerez HDifTil[6](
@@ -108,7 +108,7 @@ model Meeting
     extrapolation=Modelica.Blocks.Types.Extrapolation.Periodic,
     tableName="Internals",
     fileName=Modelica.Utilities.Files.loadResource(
-      "modelica://Buildings/Resources/Data/Experimental/DHC/Loads/Examples/BaseClasses/GeojsonExportRC/OfficeBuilding/InternalGains_Meeting.txt"),
+      "modelica://Buildings/Resources/Data/DHC/Loads/Examples/BaseClasses/GeojsonExportRC/OfficeBuilding/InternalGains_Meeting.txt"),
     columns={2,3,4})
     "Table with profiles for persons (radiative and convective) and machines (convective)"
     annotation (Placement(transformation(extent={{6,-60},{22,-44}})));
diff --git a/Buildings/Experimental/DHC/Loads/BaseClasses/Examples/BaseClasses/GeojsonExportRC/OfficeBuilding/Office.mo b/Buildings/DHC/Loads/BaseClasses/Examples/BaseClasses/GeojsonExportRC/OfficeBuilding/Office.mo
similarity index 97%
rename from Buildings/Experimental/DHC/Loads/BaseClasses/Examples/BaseClasses/GeojsonExportRC/OfficeBuilding/Office.mo
rename to Buildings/DHC/Loads/BaseClasses/Examples/BaseClasses/GeojsonExportRC/OfficeBuilding/Office.mo
index 20e08a4bd46..fdcb81915aa 100644
--- a/Buildings/Experimental/DHC/Loads/BaseClasses/Examples/BaseClasses/GeojsonExportRC/OfficeBuilding/Office.mo
+++ b/Buildings/DHC/Loads/BaseClasses/Examples/BaseClasses/GeojsonExportRC/OfficeBuilding/Office.mo
@@ -1,4 +1,4 @@
-within Buildings.Experimental.DHC.Loads.BaseClasses.Examples.BaseClasses.GeojsonExportRC.OfficeBuilding;
+within Buildings.DHC.Loads.BaseClasses.Examples.BaseClasses.GeojsonExportRC.OfficeBuilding;
 model Office
   "This is the simulation model of Office within building OfficeBuilding"
   Buildings.BoundaryConditions.SolarIrradiation.DiffusePerez HDifTil[6](
@@ -108,7 +108,7 @@ model Office
     extrapolation=Modelica.Blocks.Types.Extrapolation.Periodic,
     tableName="Internals",
     fileName=Modelica.Utilities.Files.loadResource(
-      "modelica://Buildings/Resources/Data/Experimental/DHC/Loads/Examples/BaseClasses/GeojsonExportRC/OfficeBuilding/InternalGains_Office.txt"),
+      "modelica://Buildings/Resources/Data/DHC/Loads/Examples/BaseClasses/GeojsonExportRC/OfficeBuilding/InternalGains_Office.txt"),
     columns={2,3,4})
     "Table with profiles for persons (radiative and convective) and machines (convective)"
     annotation (Placement(transformation(extent={{6,-60},{22,-44}})));
diff --git a/Buildings/Experimental/DHC/Loads/BaseClasses/Examples/BaseClasses/GeojsonExportRC/OfficeBuilding/Restroom.mo b/Buildings/DHC/Loads/BaseClasses/Examples/BaseClasses/GeojsonExportRC/OfficeBuilding/Restroom.mo
similarity index 97%
rename from Buildings/Experimental/DHC/Loads/BaseClasses/Examples/BaseClasses/GeojsonExportRC/OfficeBuilding/Restroom.mo
rename to Buildings/DHC/Loads/BaseClasses/Examples/BaseClasses/GeojsonExportRC/OfficeBuilding/Restroom.mo
index ae3041ec40b..174d779aaf2 100644
--- a/Buildings/Experimental/DHC/Loads/BaseClasses/Examples/BaseClasses/GeojsonExportRC/OfficeBuilding/Restroom.mo
+++ b/Buildings/DHC/Loads/BaseClasses/Examples/BaseClasses/GeojsonExportRC/OfficeBuilding/Restroom.mo
@@ -1,4 +1,4 @@
-within Buildings.Experimental.DHC.Loads.BaseClasses.Examples.BaseClasses.GeojsonExportRC.OfficeBuilding;
+within Buildings.DHC.Loads.BaseClasses.Examples.BaseClasses.GeojsonExportRC.OfficeBuilding;
 model Restroom
   "This is the simulation model of Restroom within building OfficeBuilding"
   Buildings.BoundaryConditions.SolarIrradiation.DiffusePerez HDifTil[6](
@@ -108,7 +108,7 @@ model Restroom
     extrapolation=Modelica.Blocks.Types.Extrapolation.Periodic,
     tableName="Internals",
     fileName=Modelica.Utilities.Files.loadResource(
-      "modelica://Buildings/Resources/Data/Experimental/DHC/Loads/Examples/BaseClasses/GeojsonExportRC/OfficeBuilding/InternalGains_Restroom.txt"),
+      "modelica://Buildings/Resources/Data/DHC/Loads/Examples/BaseClasses/GeojsonExportRC/OfficeBuilding/InternalGains_Restroom.txt"),
     columns={2,3,4})
     "Table with profiles for persons (radiative and convective) and machines (convective)"
     annotation (Placement(transformation(extent={{6,-60},{22,-44}})));
diff --git a/Buildings/Experimental/DHC/Loads/BaseClasses/Examples/BaseClasses/GeojsonExportRC/OfficeBuilding/Storage.mo b/Buildings/DHC/Loads/BaseClasses/Examples/BaseClasses/GeojsonExportRC/OfficeBuilding/Storage.mo
similarity index 97%
rename from Buildings/Experimental/DHC/Loads/BaseClasses/Examples/BaseClasses/GeojsonExportRC/OfficeBuilding/Storage.mo
rename to Buildings/DHC/Loads/BaseClasses/Examples/BaseClasses/GeojsonExportRC/OfficeBuilding/Storage.mo
index 6e7c0e8861f..c755088d610 100644
--- a/Buildings/Experimental/DHC/Loads/BaseClasses/Examples/BaseClasses/GeojsonExportRC/OfficeBuilding/Storage.mo
+++ b/Buildings/DHC/Loads/BaseClasses/Examples/BaseClasses/GeojsonExportRC/OfficeBuilding/Storage.mo
@@ -1,4 +1,4 @@
-within Buildings.Experimental.DHC.Loads.BaseClasses.Examples.BaseClasses.GeojsonExportRC.OfficeBuilding;
+within Buildings.DHC.Loads.BaseClasses.Examples.BaseClasses.GeojsonExportRC.OfficeBuilding;
 model Storage
   "This is the simulation model of Storage within building OfficeBuilding"
   Buildings.BoundaryConditions.SolarIrradiation.DiffusePerez HDifTil[6](
@@ -108,7 +108,7 @@ model Storage
     extrapolation=Modelica.Blocks.Types.Extrapolation.Periodic,
     tableName="Internals",
     fileName=Modelica.Utilities.Files.loadResource(
-      "modelica://Buildings/Resources/Data/Experimental/DHC/Loads/Examples/BaseClasses/GeojsonExportRC/OfficeBuilding/InternalGains_Storage.txt"),
+      "modelica://Buildings/Resources/Data/DHC/Loads/Examples/BaseClasses/GeojsonExportRC/OfficeBuilding/InternalGains_Storage.txt"),
     columns={2,3,4})
     "Table with profiles for persons (radiative and convective) and machines (convective)"
     annotation (Placement(transformation(extent={{6,-60},{22,-44}})));
diff --git a/Buildings/Experimental/DHC/Loads/BaseClasses/Examples/BaseClasses/GeojsonExportRC/OfficeBuilding/package.mo b/Buildings/DHC/Loads/BaseClasses/Examples/BaseClasses/GeojsonExportRC/OfficeBuilding/package.mo
similarity index 76%
rename from Buildings/Experimental/DHC/Loads/BaseClasses/Examples/BaseClasses/GeojsonExportRC/OfficeBuilding/package.mo
rename to Buildings/DHC/Loads/BaseClasses/Examples/BaseClasses/GeojsonExportRC/OfficeBuilding/package.mo
index 34491597ccd..49ec61d370d 100644
--- a/Buildings/Experimental/DHC/Loads/BaseClasses/Examples/BaseClasses/GeojsonExportRC/OfficeBuilding/package.mo
+++ b/Buildings/DHC/Loads/BaseClasses/Examples/BaseClasses/GeojsonExportRC/OfficeBuilding/package.mo
@@ -1,4 +1,4 @@
-within Buildings.Experimental.DHC.Loads.BaseClasses.Examples.BaseClasses.GeojsonExportRC;
+within Buildings.DHC.Loads.BaseClasses.Examples.BaseClasses.GeojsonExportRC;
 package OfficeBuilding "Package with RC building zone models"
   extends Modelica.Icons.Package;
 
diff --git a/Buildings/Experimental/DHC/Loads/BaseClasses/Examples/BaseClasses/GeojsonExportRC/OfficeBuilding/package.order b/Buildings/DHC/Loads/BaseClasses/Examples/BaseClasses/GeojsonExportRC/OfficeBuilding/package.order
similarity index 100%
rename from Buildings/Experimental/DHC/Loads/BaseClasses/Examples/BaseClasses/GeojsonExportRC/OfficeBuilding/package.order
rename to Buildings/DHC/Loads/BaseClasses/Examples/BaseClasses/GeojsonExportRC/OfficeBuilding/package.order
diff --git a/Buildings/Experimental/DHC/Loads/BaseClasses/Examples/BaseClasses/GeojsonExportRC/package.mo b/Buildings/DHC/Loads/BaseClasses/Examples/BaseClasses/GeojsonExportRC/package.mo
similarity index 79%
rename from Buildings/Experimental/DHC/Loads/BaseClasses/Examples/BaseClasses/GeojsonExportRC/package.mo
rename to Buildings/DHC/Loads/BaseClasses/Examples/BaseClasses/GeojsonExportRC/package.mo
index 106103a5e62..06ba8e03b86 100644
--- a/Buildings/Experimental/DHC/Loads/BaseClasses/Examples/BaseClasses/GeojsonExportRC/package.mo
+++ b/Buildings/DHC/Loads/BaseClasses/Examples/BaseClasses/GeojsonExportRC/package.mo
@@ -1,4 +1,4 @@
-within Buildings.Experimental.DHC.Loads.BaseClasses.Examples.BaseClasses;
+within Buildings.DHC.Loads.BaseClasses.Examples.BaseClasses;
 package GeojsonExportRC "Package with RC building zone models"
   extends Modelica.Icons.Package;
 
diff --git a/Buildings/Experimental/DHC/Loads/BaseClasses/Examples/BaseClasses/GeojsonExportRC/package.order b/Buildings/DHC/Loads/BaseClasses/Examples/BaseClasses/GeojsonExportRC/package.order
similarity index 100%
rename from Buildings/Experimental/DHC/Loads/BaseClasses/Examples/BaseClasses/GeojsonExportRC/package.order
rename to Buildings/DHC/Loads/BaseClasses/Examples/BaseClasses/GeojsonExportRC/package.order
diff --git a/Buildings/Experimental/DHC/Loads/BaseClasses/Examples/BaseClasses/package.mo b/Buildings/DHC/Loads/BaseClasses/Examples/BaseClasses/package.mo
similarity index 58%
rename from Buildings/Experimental/DHC/Loads/BaseClasses/Examples/BaseClasses/package.mo
rename to Buildings/DHC/Loads/BaseClasses/Examples/BaseClasses/package.mo
index 264c66e65ab..871f988089c 100644
--- a/Buildings/Experimental/DHC/Loads/BaseClasses/Examples/BaseClasses/package.mo
+++ b/Buildings/DHC/Loads/BaseClasses/Examples/BaseClasses/package.mo
@@ -1,4 +1,4 @@
-within Buildings.Experimental.DHC.Loads.BaseClasses.Examples;
+within Buildings.DHC.Loads.BaseClasses.Examples;
 package BaseClasses "Package with base classes"
   extends Modelica.Icons.BasesPackage;
 
@@ -8,8 +8,8 @@ package BaseClasses "Package with base classes"
       info="<html>
 <p>
 This package contains base classes that are used to construct the classes in
-<a href=\"modelica://Buildings.Experimental.DHC.Loads.BaseClasses.Examples\">
-Buildings.Experimental.DHC.Loads.BaseClasses.Examples</a>.
+<a href=\"modelica://Buildings.DHC.Loads.BaseClasses.Examples\">
+Buildings.DHC.Loads.BaseClasses.Examples</a>.
 </p>
 </html>"));
 end BaseClasses;
diff --git a/Buildings/DHC/Loads/BaseClasses/Examples/BaseClasses/package.order b/Buildings/DHC/Loads/BaseClasses/Examples/BaseClasses/package.order
new file mode 100644
index 00000000000..bdab1ef46ae
--- /dev/null
+++ b/Buildings/DHC/Loads/BaseClasses/Examples/BaseClasses/package.order
@@ -0,0 +1 @@
+GeojsonExportRC
diff --git a/Buildings/Experimental/DHC/Loads/BaseClasses/Examples/CouplingRCZ1Valve.mo b/Buildings/DHC/Loads/BaseClasses/Examples/CouplingRCZ1Valve.mo
similarity index 83%
rename from Buildings/Experimental/DHC/Loads/BaseClasses/Examples/CouplingRCZ1Valve.mo
rename to Buildings/DHC/Loads/BaseClasses/Examples/CouplingRCZ1Valve.mo
index 7af8f947bc0..fb80ed7f96b 100644
--- a/Buildings/Experimental/DHC/Loads/BaseClasses/Examples/CouplingRCZ1Valve.mo
+++ b/Buildings/DHC/Loads/BaseClasses/Examples/CouplingRCZ1Valve.mo
@@ -1,4 +1,4 @@
-within Buildings.Experimental.DHC.Loads.BaseClasses.Examples;
+within Buildings.DHC.Loads.BaseClasses.Examples;
 model CouplingRCZ1Valve
   "Example illustrating the coupling of a building model to heating water and chilled water loops"
   extends Modelica.Icons.Example;
@@ -11,7 +11,7 @@ model CouplingRCZ1Valve
     annotation (Placement(transformation(extent={{60,100},{40,120}})));
   package Medium1=Buildings.Media.Water
     "Source side medium";
-  Buildings.Experimental.DHC.Loads.BaseClasses.Examples.BaseClasses.BuildingRCZ1Valve bui(
+  Buildings.DHC.Loads.BaseClasses.BuildingRCZ1Valve bui(
     nPorts_aHeaWat=1,
     nPorts_aChiWat=1,
     nPorts_bHeaWat=1,
@@ -71,13 +71,13 @@ equation
       info="<html>
 <p>
 This example illustrates the use of
-<a href=\"modelica://Buildings.Experimental.DHC.Loads.BaseClasses.PartialBuilding\">
-Buildings.Experimental.DHC.Loads.BaseClasses.PartialBuilding</a>,
-<a href=\"modelica://Buildings.Experimental.DHC.Loads.BaseClasses.PartialTerminalUnit\">
-Buildings.Experimental.DHC.Loads.BaseClasses.PartialTerminalUnit</a>
+<a href=\"modelica://Buildings.DHC.Loads.BaseClasses.PartialBuilding\">
+Buildings.DHC.Loads.BaseClasses.PartialBuilding</a>,
+<a href=\"modelica://Buildings.DHC.Loads.BaseClasses.PartialTerminalUnit\">
+Buildings.DHC.Loads.BaseClasses.PartialTerminalUnit</a>
 and
-<a href=\"modelica://Buildings.Experimental.DHC.Loads.BaseClasses.FlowDistribution\">
-Buildings.Experimental.DHC.Loads.BaseClasses.FlowDistribution</a>
+<a href=\"modelica://Buildings.DHC.Loads.BaseClasses.FlowDistribution\">
+Buildings.DHC.Loads.BaseClasses.FlowDistribution</a>
 in a configuration with
 </p>
 <ul>
@@ -103,5 +103,5 @@ First implementation.
         preserveAspectRatio=false,
         extent={{-140,-20},{160,140}})),
     __Dymola_Commands(
-      file="modelica://Buildings/Resources/Scripts/Dymola/Experimental/DHC/Loads/BaseClasses/Examples/CouplingRCZ1Valve.mos" "Simulate and plot"));
+      file="modelica://Buildings/Resources/Scripts/Dymola/DHC/Loads/BaseClasses/Examples/CouplingRCZ1Valve.mos" "Simulate and plot"));
 end CouplingRCZ1Valve;
diff --git a/Buildings/Experimental/DHC/Loads/BaseClasses/Examples/CouplingRCZ6.mo b/Buildings/DHC/Loads/BaseClasses/Examples/CouplingRCZ6.mo
similarity index 83%
rename from Buildings/Experimental/DHC/Loads/BaseClasses/Examples/CouplingRCZ6.mo
rename to Buildings/DHC/Loads/BaseClasses/Examples/CouplingRCZ6.mo
index 5105b9c850a..1a37da52d71 100644
--- a/Buildings/Experimental/DHC/Loads/BaseClasses/Examples/CouplingRCZ6.mo
+++ b/Buildings/DHC/Loads/BaseClasses/Examples/CouplingRCZ6.mo
@@ -1,4 +1,4 @@
-within Buildings.Experimental.DHC.Loads.BaseClasses.Examples;
+within Buildings.DHC.Loads.BaseClasses.Examples;
 model CouplingRCZ6
   "Example illustrating the coupling of a building model to heating water and chilled water loops"
   extends Modelica.Icons.Example;
@@ -11,7 +11,7 @@ model CouplingRCZ6
       "modelica://Buildings/Resources/weatherdata/USA_CA_San.Francisco.Intl.AP.724940_TMY3.mos"))
     "Weather data reader"
     annotation (Placement(transformation(extent={{60,20},{40,40}})));
-  Buildings.Experimental.DHC.Loads.BaseClasses.Examples.BaseClasses.BuildingRCZ6 bui(
+  Buildings.DHC.Loads.BaseClasses.BuildingRCZ6 bui(
     nPorts_aHeaWat=1,
     nPorts_aChiWat=1,
     nPorts_bHeaWat=1,
@@ -70,13 +70,13 @@ equation
       info="<html>
 <p>
 This example illustrates the use of
-<a href=\"modelica://Buildings.Experimental.DHC.Loads.BaseClasses.PartialBuilding\">
-Buildings.Experimental.DHC.Loads.BaseClasses.PartialBuilding</a>,
-<a href=\"modelica://Buildings.Experimental.DHC.Loads.BaseClasses.PartialTerminalUnit\">
-Buildings.Experimental.DHC.Loads.BaseClasses.PartialTerminalUnit</a>
+<a href=\"modelica://Buildings.DHC.Loads.BaseClasses.PartialBuilding\">
+Buildings.DHC.Loads.BaseClasses.PartialBuilding</a>,
+<a href=\"modelica://Buildings.DHC.Loads.BaseClasses.PartialTerminalUnit\">
+Buildings.DHC.Loads.BaseClasses.PartialTerminalUnit</a>
 and
-<a href=\"modelica://Buildings.Experimental.DHC.Loads.BaseClasses.FlowDistribution\">
-Buildings.Experimental.DHC.Loads.BaseClasses.FlowDistribution</a>
+<a href=\"modelica://Buildings.DHC.Loads.BaseClasses.FlowDistribution\">
+Buildings.DHC.Loads.BaseClasses.FlowDistribution</a>
 in a configuration with
 </p>
 <ul>
@@ -102,7 +102,7 @@ First implementation.
         preserveAspectRatio=false,
         extent={{-120,-100},{160,60}})),
     __Dymola_Commands(
-      file="modelica://Buildings/Resources/Scripts/Dymola/Experimental/DHC/Loads/BaseClasses/Examples/CouplingRCZ6.mos" "Simulate and plot"),
+      file="modelica://Buildings/Resources/Scripts/Dymola/DHC/Loads/BaseClasses/Examples/CouplingRCZ6.mos" "Simulate and plot"),
     experiment(
       StopTime=604800,
       Tolerance=1e-06));
diff --git a/Buildings/Experimental/DHC/Loads/BaseClasses/Examples/CouplingSpawnZ1.mo b/Buildings/DHC/Loads/BaseClasses/Examples/CouplingSpawnZ1.mo
similarity index 83%
rename from Buildings/Experimental/DHC/Loads/BaseClasses/Examples/CouplingSpawnZ1.mo
rename to Buildings/DHC/Loads/BaseClasses/Examples/CouplingSpawnZ1.mo
index 19421bc0135..badf98affc9 100644
--- a/Buildings/Experimental/DHC/Loads/BaseClasses/Examples/CouplingSpawnZ1.mo
+++ b/Buildings/DHC/Loads/BaseClasses/Examples/CouplingSpawnZ1.mo
@@ -1,10 +1,10 @@
-within Buildings.Experimental.DHC.Loads.BaseClasses.Examples;
+within Buildings.DHC.Loads.BaseClasses.Examples;
 model CouplingSpawnZ1
   "Example illustrating the coupling of a building model to heating water and chilled water loops"
   extends Modelica.Icons.Example;
   package Medium1=Buildings.Media.Water
     "Source side medium";
-  Buildings.Experimental.DHC.Loads.BaseClasses.Examples.BaseClasses.BuildingSpawnZ1 bui(
+  Buildings.DHC.Loads.BaseClasses.BuildingSpawnZ1 bui(
     nPorts_aHeaWat=1,
     nPorts_aChiWat=1,
     nPorts_bHeaWat=1,
@@ -76,13 +76,13 @@ equation
       info="<html>
 <p>
 This example illustrates the use of
-<a href=\"modelica://Buildings.Experimental.DHC.Loads.BaseClasses.PartialBuilding\">
-Buildings.Experimental.DHC.Loads.BaseClasses.PartialBuilding</a>,
-<a href=\"modelica://Buildings.Experimental.DHC.Loads.BaseClasses.PartialTerminalUnit\">
-Buildings.Experimental.DHC.Loads.BaseClasses.PartialTerminalUnit</a>
+<a href=\"modelica://Buildings.DHC.Loads.BaseClasses.PartialBuilding\">
+Buildings.DHC.Loads.BaseClasses.PartialBuilding</a>,
+<a href=\"modelica://Buildings.DHC.Loads.BaseClasses.PartialTerminalUnit\">
+Buildings.DHC.Loads.BaseClasses.PartialTerminalUnit</a>
 and
-<a href=\"modelica://Buildings.Experimental.DHC.Loads.BaseClasses.FlowDistribution\">
-Buildings.Experimental.DHC.Loads.BaseClasses.FlowDistribution</a>
+<a href=\"modelica://Buildings.DHC.Loads.BaseClasses.FlowDistribution\">
+Buildings.DHC.Loads.BaseClasses.FlowDistribution</a>
 in a configuration with
 </p>
 <ul>
@@ -107,5 +107,5 @@ First implementation.
         preserveAspectRatio=false,
         extent={{-100,-140},{160,80}})),
     __Dymola_Commands(
-      file="modelica://Buildings/Resources/Scripts/Dymola/Experimental/DHC/Loads/BaseClasses/Examples/CouplingSpawnZ1.mos" "Simulate and plot"));
+      file="modelica://Buildings/Resources/Scripts/Dymola/DHC/Loads/BaseClasses/Examples/CouplingSpawnZ1.mos" "Simulate and plot"));
 end CouplingSpawnZ1;
diff --git a/Buildings/Experimental/DHC/Loads/BaseClasses/Examples/CouplingSpawnZ6.mo b/Buildings/DHC/Loads/BaseClasses/Examples/CouplingSpawnZ6.mo
similarity index 82%
rename from Buildings/Experimental/DHC/Loads/BaseClasses/Examples/CouplingSpawnZ6.mo
rename to Buildings/DHC/Loads/BaseClasses/Examples/CouplingSpawnZ6.mo
index 1f9b42bfd43..a4feebdcf11 100644
--- a/Buildings/Experimental/DHC/Loads/BaseClasses/Examples/CouplingSpawnZ6.mo
+++ b/Buildings/DHC/Loads/BaseClasses/Examples/CouplingSpawnZ6.mo
@@ -1,10 +1,10 @@
-within Buildings.Experimental.DHC.Loads.BaseClasses.Examples;
+within Buildings.DHC.Loads.BaseClasses.Examples;
 model CouplingSpawnZ6
   "Example illustrating the coupling of a building model to heating water and chilled water loops"
   extends Modelica.Icons.Example;
   package Medium1=Buildings.Media.Water
     "Source side medium";
-  Buildings.Experimental.DHC.Loads.BaseClasses.Examples.BaseClasses.BuildingSpawnZ6 bui(
+  Buildings.DHC.Loads.BaseClasses.BuildingSpawnZ6 bui(
     nPorts_aHeaWat=1,
     nPorts_aChiWat=1,
     nPorts_bHeaWat=1,
@@ -64,13 +64,13 @@ equation
       info="<html>
 <p>
 This example illustrates the use of
-<a href=\"modelica://Buildings.Experimental.DHC.Loads.BaseClasses.PartialBuilding\">
-Buildings.Experimental.DHC.Loads.BaseClasses.PartialBuilding</a>,
-<a href=\"modelica://Buildings.Experimental.DHC.Loads.BaseClasses.PartialTerminalUnit\">
-Buildings.Experimental.DHC.Loads.BaseClasses.PartialTerminalUnit</a>
+<a href=\"modelica://Buildings.DHC.Loads.BaseClasses.PartialBuilding\">
+Buildings.DHC.Loads.BaseClasses.PartialBuilding</a>,
+<a href=\"modelica://Buildings.DHC.Loads.BaseClasses.PartialTerminalUnit\">
+Buildings.DHC.Loads.BaseClasses.PartialTerminalUnit</a>
 and
-<a href=\"modelica://Buildings.Experimental.DHC.Loads.BaseClasses.FlowDistribution\">
-Buildings.Experimental.DHC.Loads.BaseClasses.FlowDistribution</a>
+<a href=\"modelica://Buildings.DHC.Loads.BaseClasses.FlowDistribution\">
+Buildings.DHC.Loads.BaseClasses.FlowDistribution</a>
 in a configuration with
 </p>
 <ul>
@@ -107,5 +107,5 @@ First implementation.
           textColor={28,108,200},
           textString="")}),
     __Dymola_Commands(
-      file="modelica://Buildings/Resources/Scripts/Dymola/Experimental/DHC/Loads/BaseClasses/Examples/CouplingSpawnZ6.mos" "Simulate and plot"));
+      file="modelica://Buildings/Resources/Scripts/Dymola/DHC/Loads/BaseClasses/Examples/CouplingSpawnZ6.mos" "Simulate and plot"));
 end CouplingSpawnZ6;
diff --git a/Buildings/Experimental/DHC/Loads/BaseClasses/Examples/CouplingTimeSeries.mo b/Buildings/DHC/Loads/BaseClasses/Examples/CouplingTimeSeries.mo
similarity index 88%
rename from Buildings/Experimental/DHC/Loads/BaseClasses/Examples/CouplingTimeSeries.mo
rename to Buildings/DHC/Loads/BaseClasses/Examples/CouplingTimeSeries.mo
index a47aa48c0f8..1a1e7186a25 100644
--- a/Buildings/Experimental/DHC/Loads/BaseClasses/Examples/CouplingTimeSeries.mo
+++ b/Buildings/DHC/Loads/BaseClasses/Examples/CouplingTimeSeries.mo
@@ -1,4 +1,4 @@
-within Buildings.Experimental.DHC.Loads.BaseClasses.Examples;
+within Buildings.DHC.Loads.BaseClasses.Examples;
 model CouplingTimeSeries
   "Example illustrating the coupling of a building model to heating water and chilled water loops"
   extends Modelica.Icons.Example;
@@ -6,8 +6,8 @@ model CouplingTimeSeries
     "Source side medium";
   parameter Modelica.Units.SI.Time perAve=600
     "Period for time averaged variables";
-  Buildings.Experimental.DHC.Loads.BaseClasses.Examples.BaseClasses.BuildingTimeSeries bui(
-    filNam="modelica://Buildings/Resources/Data/Experimental/DHC/Loads/Examples/SwissResidential_20190916.mos",
+  Buildings.DHC.Loads.BaseClasses.BuildingTimeSeries bui(
+    filNam="modelica://Buildings/Resources/Data/DHC/Loads/Examples/SwissResidential_20190916.mos",
     nPorts_aHeaWat=1,
     nPorts_aChiWat=1,
     nPorts_bHeaWat=1,
@@ -116,13 +116,13 @@ equation
       info="<html>
 <p>
 This example illustrates the use of
-<a href=\"modelica://Buildings.Experimental.DHC.Loads.BaseClasses.PartialBuilding\">
-Buildings.Experimental.DHC.Loads.BaseClasses.PartialBuilding</a>,
-<a href=\"modelica://Buildings.Experimental.DHC.Loads.BaseClasses.PartialTerminalUnit\">
-Buildings.Experimental.DHC.Loads.BaseClasses.PartialTerminalUnit</a>
+<a href=\"modelica://Buildings.DHC.Loads.BaseClasses.PartialBuilding\">
+Buildings.DHC.Loads.BaseClasses.PartialBuilding</a>,
+<a href=\"modelica://Buildings.DHC.Loads.BaseClasses.PartialTerminalUnit\">
+Buildings.DHC.Loads.BaseClasses.PartialTerminalUnit</a>
 and
-<a href=\"modelica://Buildings.Experimental.DHC.Loads.BaseClasses.FlowDistribution\">
-Buildings.Experimental.DHC.Loads.BaseClasses.FlowDistribution</a>
+<a href=\"modelica://Buildings.DHC.Loads.BaseClasses.FlowDistribution\">
+Buildings.DHC.Loads.BaseClasses.FlowDistribution</a>
 in a configuration with
 </p>
 <ul>
@@ -154,5 +154,5 @@ First implementation.
         preserveAspectRatio=false,
         extent={{-160,-140},{160,140}})),
     __Dymola_Commands(
-      file="modelica://Buildings/Resources/Scripts/Dymola/Experimental/DHC/Loads/BaseClasses/Examples/CouplingTimeSeries.mos" "Simulate and plot"));
+      file="modelica://Buildings/Resources/Scripts/Dymola/DHC/Loads/BaseClasses/Examples/CouplingTimeSeries.mos" "Simulate and plot"));
 end CouplingTimeSeries;
diff --git a/Buildings/Experimental/DHC/Loads/BaseClasses/Examples/CouplingTimeSeriesSingleLoop.mo b/Buildings/DHC/Loads/BaseClasses/Examples/CouplingTimeSeriesSingleLoop.mo
similarity index 85%
rename from Buildings/Experimental/DHC/Loads/BaseClasses/Examples/CouplingTimeSeriesSingleLoop.mo
rename to Buildings/DHC/Loads/BaseClasses/Examples/CouplingTimeSeriesSingleLoop.mo
index 8ea1a82bc5e..218bff632df 100644
--- a/Buildings/Experimental/DHC/Loads/BaseClasses/Examples/CouplingTimeSeriesSingleLoop.mo
+++ b/Buildings/DHC/Loads/BaseClasses/Examples/CouplingTimeSeriesSingleLoop.mo
@@ -1,4 +1,4 @@
-within Buildings.Experimental.DHC.Loads.BaseClasses.Examples;
+within Buildings.DHC.Loads.BaseClasses.Examples;
 model CouplingTimeSeriesSingleLoop
   "Example illustrating the coupling of a building model to heating water or chilled water loops"
   extends Modelica.Icons.Example;
@@ -6,9 +6,9 @@ model CouplingTimeSeriesSingleLoop
     "Source side medium";
   parameter Modelica.Units.SI.Time perAve=600
     "Period for time averaged variables";
-  Buildings.Experimental.DHC.Loads.BaseClasses.Examples.BaseClasses.BuildingTimeSeries buiCoo(
+  Buildings.DHC.Loads.BaseClasses.BuildingTimeSeries buiCoo(
     have_heaWat=false,
-    filNam="modelica://Buildings/Resources/Data/Experimental/DHC/Loads/Examples/SwissResidential_20190916.mos",
+    filNam="modelica://Buildings/Resources/Data/DHC/Loads/Examples/SwissResidential_20190916.mos",
     nPorts_aChiWat=1,
     nPorts_bChiWat=1)
     "Building wint cooling only"
@@ -42,9 +42,9 @@ model CouplingTimeSeriesSingleLoop
     y(unit="J"))
     "Actual energy used for cooling"
     annotation (Placement(transformation(extent={{80,60},{100,80}})));
-  Buildings.Experimental.DHC.Loads.BaseClasses.Examples.BaseClasses.BuildingTimeSeries buiHea(
+  Buildings.DHC.Loads.BaseClasses.BuildingTimeSeries buiHea(
     have_chiWat=false,
-    filNam="modelica://Buildings/Resources/Data/Experimental/DHC/Loads/Examples/SwissResidential_20190916.mos",
+    filNam="modelica://Buildings/Resources/Data/DHC/Loads/Examples/SwissResidential_20190916.mos",
     nPorts_aChiWat=1,
     nPorts_bChiWat=1,
     nPorts_aHeaWat=1,
@@ -118,13 +118,13 @@ equation
       info="<html>
 <p>
 This example illustrates the use of
-<a href=\"modelica://Buildings.Experimental.DHC.Loads.BaseClasses.PartialBuilding\">
-Buildings.Experimental.DHC.Loads.BaseClasses.PartialBuilding</a>,
-<a href=\"modelica://Buildings.Experimental.DHC.Loads.BaseClasses.PartialTerminalUnit\">
-Buildings.Experimental.DHC.Loads.BaseClasses.PartialTerminalUnit</a>
+<a href=\"modelica://Buildings.DHC.Loads.BaseClasses.PartialBuilding\">
+Buildings.DHC.Loads.BaseClasses.PartialBuilding</a>,
+<a href=\"modelica://Buildings.DHC.Loads.BaseClasses.PartialTerminalUnit\">
+Buildings.DHC.Loads.BaseClasses.PartialTerminalUnit</a>
 and
-<a href=\"modelica://Buildings.Experimental.DHC.Loads.BaseClasses.FlowDistribution\">
-Buildings.Experimental.DHC.Loads.BaseClasses.FlowDistribution</a>
+<a href=\"modelica://Buildings.DHC.Loads.BaseClasses.FlowDistribution\">
+Buildings.DHC.Loads.BaseClasses.FlowDistribution</a>
 in a configuration with
 </p>
 <ul>
@@ -161,5 +161,5 @@ First implementation.
         preserveAspectRatio=false,
         extent={{-160,-140},{160,140}})),
     __Dymola_Commands(
-      file="modelica://Buildings/Resources/Scripts/Dymola/Experimental/DHC/Loads/BaseClasses/Examples/CouplingTimeSeriesSingleLoop.mos" "Simulate and plot"));
+      file="modelica://Buildings/Resources/Scripts/Dymola/DHC/Loads/BaseClasses/Examples/CouplingTimeSeriesSingleLoop.mos" "Simulate and plot"));
 end CouplingTimeSeriesSingleLoop;
diff --git a/Buildings/Experimental/DHC/Plants/Cooling/Examples/package.mo b/Buildings/DHC/Loads/BaseClasses/Examples/package.mo
similarity index 64%
rename from Buildings/Experimental/DHC/Plants/Cooling/Examples/package.mo
rename to Buildings/DHC/Loads/BaseClasses/Examples/package.mo
index 662d7723533..6acc989368f 100644
--- a/Buildings/Experimental/DHC/Plants/Cooling/Examples/package.mo
+++ b/Buildings/DHC/Loads/BaseClasses/Examples/package.mo
@@ -1,4 +1,4 @@
-within Buildings.Experimental.DHC.Plants.Cooling;
+within Buildings.DHC.Loads.BaseClasses;
 package Examples "Example models integrating multiple components"
   extends Modelica.Icons.ExamplesPackage;
 
@@ -8,8 +8,8 @@ package Examples "Example models integrating multiple components"
       info="<html>
 <p>
 This package contains advanced examples illustrating the use of the models in
-<a href=\"modelica://Buildings.Experimental.DHC.Plants.Cooling\">
-Buildings.Experimental.DHC.Plants.Cooling</a>.
+<a href=\"modelica://Buildings.DHC.Loads\">
+Buildings.DHC.Loads</a>.
 </p>
 </html>"));
 end Examples;
diff --git a/Buildings/Experimental/DHC/Loads/BaseClasses/Examples/package.order b/Buildings/DHC/Loads/BaseClasses/Examples/package.order
similarity index 100%
rename from Buildings/Experimental/DHC/Loads/BaseClasses/Examples/package.order
rename to Buildings/DHC/Loads/BaseClasses/Examples/package.order
diff --git a/Buildings/Experimental/DHC/Loads/BaseClasses/Examples/BaseClasses/FanCoil4Pipe.mo b/Buildings/DHC/Loads/BaseClasses/FanCoil4Pipe.mo
similarity index 80%
rename from Buildings/Experimental/DHC/Loads/BaseClasses/Examples/BaseClasses/FanCoil4Pipe.mo
rename to Buildings/DHC/Loads/BaseClasses/FanCoil4Pipe.mo
index 9ef61c071e1..5505ec477c3 100644
--- a/Buildings/Experimental/DHC/Loads/BaseClasses/Examples/BaseClasses/FanCoil4Pipe.mo
+++ b/Buildings/DHC/Loads/BaseClasses/FanCoil4Pipe.mo
@@ -1,4 +1,4 @@
-within Buildings.Experimental.DHC.Loads.BaseClasses.Examples.BaseClasses;
+within Buildings.DHC.Loads.BaseClasses;
 model FanCoil4Pipe
   "Model of a sensible only four-pipe fan coil unit computing a required water mass flow rate"
   extends PartialFanCoil4Pipe(
@@ -21,8 +21,8 @@ equation
 This is a simplified model of a sensible only four-pipe fan coil unit for heating and cooling.
 It is intended to be coupled to a room model by means of fluid ports.
 See
-<a href=\"modelica://Buildings.Experimental.DHC.Loads.BaseClasses.Examples.BaseClasses.PartialFanCoil4Pipe\">
-Buildings.Experimental.DHC.Loads.BaseClasses.Examples.BaseClasses.PartialFanCoil4Pipe</a>
+<a href=\"modelica://Buildings.DHC.Loads.BaseClasses.PartialFanCoil4Pipe\">
+Buildings.DHC.Loads.BaseClasses.PartialFanCoil4Pipe</a>
 for a description of the modeling principles.
 </p>
 </html>",
diff --git a/Buildings/Experimental/DHC/Loads/BaseClasses/Examples/BaseClasses/FanCoil4PipeHeatPorts.mo b/Buildings/DHC/Loads/BaseClasses/FanCoil4PipeHeatPorts.mo
similarity index 93%
rename from Buildings/Experimental/DHC/Loads/BaseClasses/Examples/BaseClasses/FanCoil4PipeHeatPorts.mo
rename to Buildings/DHC/Loads/BaseClasses/FanCoil4PipeHeatPorts.mo
index 6cf2f590f64..0e7acdc0a37 100644
--- a/Buildings/Experimental/DHC/Loads/BaseClasses/Examples/BaseClasses/FanCoil4PipeHeatPorts.mo
+++ b/Buildings/DHC/Loads/BaseClasses/FanCoil4PipeHeatPorts.mo
@@ -1,4 +1,4 @@
-within Buildings.Experimental.DHC.Loads.BaseClasses.Examples.BaseClasses;
+within Buildings.DHC.Loads.BaseClasses;
 model FanCoil4PipeHeatPorts
   "Model of a sensible only four-pipe fan coil unit computing a required water mass flow rate"
   extends PartialFanCoil4Pipe(
@@ -72,8 +72,8 @@ equation
 This is a simplified model of a sensible only four-pipe fan coil unit for heating and cooling.
 It is intended to be coupled to a room model by means of heat ports.
 See
-<a href=\"modelica://Buildings.Experimental.DHC.Loads.BaseClasses.Examples.BaseClasses.PartialFanCoil4Pipe\">
-Buildings.Experimental.DHC.Loads.BaseClasses.Examples.BaseClasses.PartialFanCoil4Pipe</a>
+<a href=\"modelica://Buildings.DHC.Loads.BaseClasses.PartialFanCoil4Pipe\">
+Buildings.DHC.Loads.BaseClasses.PartialFanCoil4Pipe</a>
 for a description of the modeling principles.
 </p>
 </html>",
diff --git a/Buildings/Experimental/DHC/Loads/BaseClasses/FlowDistribution.mo b/Buildings/DHC/Loads/BaseClasses/FlowDistribution.mo
similarity index 96%
rename from Buildings/Experimental/DHC/Loads/BaseClasses/FlowDistribution.mo
rename to Buildings/DHC/Loads/BaseClasses/FlowDistribution.mo
index c75092d6ef3..37048a028d8 100644
--- a/Buildings/Experimental/DHC/Loads/BaseClasses/FlowDistribution.mo
+++ b/Buildings/DHC/Loads/BaseClasses/FlowDistribution.mo
@@ -1,12 +1,12 @@
-within Buildings.Experimental.DHC.Loads.BaseClasses;
+within Buildings.DHC.Loads.BaseClasses;
 model FlowDistribution
   "Model of a building hydraulic distribution system"
   extends Buildings.Fluid.Interfaces.PartialTwoPortInterface(
     redeclare replaceable package Medium=Buildings.Media.Water,
     allowFlowReversal=false);
-  import Type_dis=Buildings.Experimental.DHC.Loads.BaseClasses.Types.DistributionType
+  import Type_dis=Buildings.DHC.Loads.BaseClasses.Types.DistributionType
     "Types of distribution system";
-  import Type_ctr=Buildings.Experimental.DHC.Loads.BaseClasses.Types.PumpControlType
+  import Type_ctr=Buildings.DHC.Loads.BaseClasses.Types.PumpControlType
     "Types of distribution pump control";
   parameter Integer nPorts_a1=0
     "Number of terminal units return ports"
@@ -256,7 +256,7 @@ model FlowDistribution
     final nout=nUni)
     "Repeat input to output an array"
     annotation (Placement(transformation(extent={{20,150},{40,170}})));
-  Buildings.Experimental.DHC.Loads.BaseClasses.Controls.MixingValveControl conVal(
+  Buildings.DHC.Loads.BaseClasses.Controls.MixingValveControl conVal(
     final typDis=typDis) if have_val
     "Mixing valve controller"
     annotation (Placement(transformation(extent={{-48,-106},{-28,-86}})));
@@ -427,13 +427,13 @@ equation
 This model represents a two-pipe hydraulic distribution system serving multiple
 terminal units.
 It is primarily intended to be used in conjunction with models that extend
-<a href=\"modelica://Buildings.Experimental.DHC.Loads.BaseClasses.PartialTerminalUnit\">
-Buildings.Experimental.DHC.Loads.BaseClasses.PartialTerminalUnit</a>.
+<a href=\"modelica://Buildings.DHC.Loads.BaseClasses.PartialTerminalUnit\">
+Buildings.DHC.Loads.BaseClasses.PartialTerminalUnit</a>.
 The typical model structure for a whole building connected to an energy
 transfer station (or a dedicated plant) is illustrated in the schematics in
 the info section of
-<a href=\"modelica://Buildings.Experimental.DHC.Loads.BaseClasses.PartialBuilding\">
-Buildings.Experimental.DHC.Loads.BaseClasses.PartialBuilding</a>.
+<a href=\"modelica://Buildings.DHC.Loads.BaseClasses.PartialBuilding\">
+Buildings.DHC.Loads.BaseClasses.PartialBuilding</a>.
 </p>
 <p>
 The pipe network modeling is decoupled between a main distribution
@@ -493,8 +493,8 @@ The impact on the computational performance is illustrated
 <h4>Pump head computation</h4>
 <p>
 The pump head is computed as follows (see also
-<a href=\"modelica://Buildings.Experimental.DHC.Loads.BaseClasses.Validation.FlowDistributionPumpControl\">
-Buildings.Experimental.DHC.Loads.BaseClasses.Validation.FlowDistributionPumpControl</a>
+<a href=\"modelica://Buildings.DHC.Loads.BaseClasses.Validation.FlowDistributionPumpControl\">
+Buildings.DHC.Loads.BaseClasses.Validation.FlowDistributionPumpControl</a>
 for a comparison with an explicit modeling of the piping network).
 </p>
 <ul>
@@ -578,7 +578,7 @@ sensor must be set to zero.
 </ul>
 <p>
 <img alt=\"image\"
-src=\"modelica://Buildings/Resources/Images/Experimental/DHC/Loads/FlowDistribution1.png\"/>
+src=\"modelica://Buildings/Resources/Images/DHC/Loads/FlowDistribution1.png\"/>
 </p>
 <h4>Energy and mass dynamics</h4>
 <p>
@@ -611,12 +611,12 @@ turn out to be detrimental to computational performance.
 <p>
 The figure below compares the computational performance of this model
 (labelled <code>simple</code>, see model
-<a href=\"modelica://Buildings.Experimental.DHC.Loads.BaseClasses.Validation.BenchmarkFlowDistribution1\">
-Buildings.Experimental.DHC.Loads.BaseClasses.Validation.BenchmarkFlowDistribution1</a>)
+<a href=\"modelica://Buildings.DHC.Loads.BaseClasses.Validation.BenchmarkFlowDistribution1\">
+Buildings.DHC.Loads.BaseClasses.Validation.BenchmarkFlowDistribution1</a>)
 with an explicit modeling of the distribution network and
 the terminal unit actuators (labelled <code>detailed</code>, see model
-<a href=\"modelica://Buildings.Experimental.DHC.Loads.BaseClasses.Validation.BenchmarkFlowDistribution2\">
-Buildings.Experimental.DHC.Loads.BaseClasses.Validation.BenchmarkFlowDistribution2</a>).
+<a href=\"modelica://Buildings.DHC.Loads.BaseClasses.Validation.BenchmarkFlowDistribution2\">
+Buildings.DHC.Loads.BaseClasses.Validation.BenchmarkFlowDistribution2</a>).
 The models are simulated with the solver CVODE from Sundials.
 The impact of a varying number of connected loads, <code>nLoa</code>, is
 assessed on
@@ -638,7 +638,7 @@ also plotted for the model labelled <code>simple</code>, resp. <code>detailed</c
 </p>
 <p>
 <img alt=\"image\"
-src=\"modelica://Buildings/Resources/Images/Experimental/DHC/Loads/FlowDistribution2.png\"/>
+src=\"modelica://Buildings/Resources/Images/DHC/Loads/FlowDistribution2.png\"/>
 </p>
 </html>",
       revisions="<html>
diff --git a/Buildings/Experimental/DHC/Loads/BaseClasses/PartialBuilding.mo b/Buildings/DHC/Loads/BaseClasses/PartialBuilding.mo
similarity index 96%
rename from Buildings/Experimental/DHC/Loads/BaseClasses/PartialBuilding.mo
rename to Buildings/DHC/Loads/BaseClasses/PartialBuilding.mo
index b34bf925dc9..114feed658f 100644
--- a/Buildings/Experimental/DHC/Loads/BaseClasses/PartialBuilding.mo
+++ b/Buildings/DHC/Loads/BaseClasses/PartialBuilding.mo
@@ -1,4 +1,4 @@
-within Buildings.Experimental.DHC.Loads.BaseClasses;
+within Buildings.DHC.Loads.BaseClasses;
 partial model PartialBuilding
   "Partial class for building model"
   replaceable package Medium=Buildings.Media.Water
@@ -230,11 +230,11 @@ equation
 Partial model to be used for modeling the thermal loads on an energy
 transfer station or a dedicated plant.
 Models extending this class are typically used in conjunction with
-<a href=\"modelica://Buildings.Experimental.DHC.Loads.BaseClasses.FlowDistribution\">
-Buildings.Experimental.DHC.Loads.BaseClasses.FlowDistribution</a>
+<a href=\"modelica://Buildings.DHC.Loads.BaseClasses.FlowDistribution\">
+Buildings.DHC.Loads.BaseClasses.FlowDistribution</a>
 and models extending
-<a href=\"modelica://Buildings.Experimental.DHC.Loads.BaseClasses.PartialTerminalUnit\">
-Buildings.Experimental.DHC.Loads.BaseClasses.PartialTerminalUnit</a>
+<a href=\"modelica://Buildings.DHC.Loads.BaseClasses.PartialTerminalUnit\">
+Buildings.DHC.Loads.BaseClasses.PartialTerminalUnit</a>
 as described in the schematics here under.
 The fluid ports represent the connection between the production system and
 the building distribution system.
@@ -254,13 +254,13 @@ multiple identical buildings served by the same energy transfer station.
 <h4>Examples</h4>
 <p>
 See various use cases in
-<a href=\"modelica://Buildings.Experimental.DHC.Loads.BaseClasses.Examples\">
-Buildings.Experimental.DHC.Loads.BaseClasses.Examples</a>.
+<a href=\"modelica://Buildings.DHC.Loads.BaseClasses.Examples\">
+Buildings.DHC.Loads.BaseClasses.Examples</a>.
 </p>
 <p>
 <br/>
 <img alt=\"image\"
-src=\"modelica://Buildings/Resources/Images/Experimental/DHC/Loads/PartialBuilding.png\"/>
+src=\"modelica://Buildings/Resources/Images/DHC/Loads/PartialBuilding.png\"/>
 </p>
 </html>",
 revisions="<html>
diff --git a/Buildings/Experimental/DHC/Loads/BaseClasses/PartialBuildingWithPartialETS.mo b/Buildings/DHC/Loads/BaseClasses/PartialBuildingWithPartialETS.mo
similarity index 85%
rename from Buildings/Experimental/DHC/Loads/BaseClasses/PartialBuildingWithPartialETS.mo
rename to Buildings/DHC/Loads/BaseClasses/PartialBuildingWithPartialETS.mo
index e1a888937a3..77fa03d94d9 100644
--- a/Buildings/Experimental/DHC/Loads/BaseClasses/PartialBuildingWithPartialETS.mo
+++ b/Buildings/DHC/Loads/BaseClasses/PartialBuildingWithPartialETS.mo
@@ -1,7 +1,7 @@
-within Buildings.Experimental.DHC.Loads.BaseClasses;
+within Buildings.DHC.Loads.BaseClasses;
 partial model PartialBuildingWithPartialETS
   "Partial model of a building with an energy transfer station"
-  import TypDisSys=Buildings.Experimental.DHC.Types.DistrictSystemType
+  import TypDisSys=Buildings.DHC.Types.DistrictSystemType
     "District system type enumeration";
   replaceable package MediumSer=Buildings.Media.Water
     constrainedby Modelica.Media.Interfaces.PartialMedium
@@ -101,7 +101,7 @@ partial model PartialBuildingWithPartialETS
     redeclare package Medium = MediumSer,
     m_flow(min=if allowFlowReversalSer then -Modelica.Constants.inf else 0),
     h_outflow(start=MediumSer.h_default, nominal=MediumSer.h_default))
- if typ == Buildings.Experimental.DHC.Types.DistrictSystemType.CombinedGeneration5
+ if typ == Buildings.DHC.Types.DistrictSystemType.CombinedGeneration5
     "Fluid connector for ambient water service supply line"
     annotation (
       Placement(transformation(extent={{-310,-210},{-290,-190}}),
@@ -110,7 +110,7 @@ partial model PartialBuildingWithPartialETS
     redeclare package Medium = MediumSer,
     m_flow(max=if allowFlowReversalSer then +Modelica.Constants.inf else 0),
     h_outflow(start=MediumSer.h_default, nominal=MediumSer.h_default))
- if typ == Buildings.Experimental.DHC.Types.DistrictSystemType.CombinedGeneration5
+ if typ == Buildings.DHC.Types.DistrictSystemType.CombinedGeneration5
     "Fluid connector for ambient water service return line"
     annotation (
       Placement(transformation(extent={{290,-210},{310,-190}}),
@@ -119,8 +119,8 @@ partial model PartialBuildingWithPartialETS
     redeclare package Medium = MediumSerHea_a,
     m_flow(min=if allowFlowReversalSer then -Modelica.Constants.inf else 0),
     h_outflow(start=MediumSerHea_a.h_default, nominal=MediumSerHea_a.h_default))
- if typ <> Buildings.Experimental.DHC.Types.DistrictSystemType.Cooling and
-    typ <> Buildings.Experimental.DHC.Types.DistrictSystemType.CombinedGeneration5
+ if typ <> Buildings.DHC.Types.DistrictSystemType.Cooling and
+    typ <> Buildings.DHC.Types.DistrictSystemType.CombinedGeneration5
     "Fluid connector for heating service supply line"
     annotation (Placement(
       transformation(extent={{-310,-250},{-290,-230}}), iconTransformation(
@@ -129,8 +129,8 @@ partial model PartialBuildingWithPartialETS
     redeclare package Medium = MediumSer,
     m_flow(max=if allowFlowReversalSer then +Modelica.Constants.inf else 0),
     h_outflow(start=MediumSer.h_default, nominal=MediumSer.h_default))
- if typ <> Buildings.Experimental.DHC.Types.DistrictSystemType.Cooling and
-    typ <> Buildings.Experimental.DHC.Types.DistrictSystemType.CombinedGeneration5
+ if typ <> Buildings.DHC.Types.DistrictSystemType.Cooling and
+    typ <> Buildings.DHC.Types.DistrictSystemType.CombinedGeneration5
     "Fluid connector for heating service return line"
     annotation (Placement(
         transformation(extent={{290,-250},{310,-230}}), iconTransformation(
@@ -139,9 +139,9 @@ partial model PartialBuildingWithPartialETS
     redeclare package Medium = MediumSer,
     m_flow(min=if allowFlowReversalSer then -Modelica.Constants.inf else 0),
     h_outflow(start=MediumSer.h_default, nominal=MediumSer.h_default))
- if typ == Buildings.Experimental.DHC.Types.DistrictSystemType.CombinedGeneration1 or
-    typ == Buildings.Experimental.DHC.Types.DistrictSystemType.CombinedGeneration2to4 or
-    typ == Buildings.Experimental.DHC.Types.DistrictSystemType.Cooling
+ if typ == Buildings.DHC.Types.DistrictSystemType.CombinedGeneration1 or
+    typ == Buildings.DHC.Types.DistrictSystemType.CombinedGeneration2to4 or
+    typ == Buildings.DHC.Types.DistrictSystemType.Cooling
     "Fluid connector for cooling service supply line"
     annotation (Placement(transformation(extent={{-310,-290},{-290,-270}}),
        iconTransformation(extent={{-110,-90},{-90,-70}})));
@@ -149,9 +149,9 @@ partial model PartialBuildingWithPartialETS
     redeclare package Medium = MediumSer,
     m_flow(max=if allowFlowReversalSer then +Modelica.Constants.inf else 0),
     h_outflow(start=MediumSer.h_default, nominal=MediumSer.h_default))
- if typ == Buildings.Experimental.DHC.Types.DistrictSystemType.CombinedGeneration1 or
-    typ == Buildings.Experimental.DHC.Types.DistrictSystemType.CombinedGeneration2to4 or
-    typ == Buildings.Experimental.DHC.Types.DistrictSystemType.Cooling
+ if typ == Buildings.DHC.Types.DistrictSystemType.CombinedGeneration1 or
+    typ == Buildings.DHC.Types.DistrictSystemType.CombinedGeneration2to4 or
+    typ == Buildings.DHC.Types.DistrictSystemType.Cooling
     "Fluid connector for cooling service return line"
     annotation (Placement(
       transformation(extent={{290,-290},{310,-270}}), iconTransformation(
@@ -199,7 +199,7 @@ partial model PartialBuildingWithPartialETS
         rotation=90,
         origin={90,120})));
   // COMPONENTS
-  replaceable Buildings.Experimental.DHC.Loads.BaseClasses.PartialBuilding bui(
+  replaceable Buildings.DHC.Loads.BaseClasses.PartialBuilding bui(
     redeclare final package Medium=MediumBui,
     final nPorts_aHeaWat=nPorts_heaWat,
     final nPorts_bHeaWat=nPorts_heaWat,
@@ -208,7 +208,7 @@ partial model PartialBuildingWithPartialETS
     final allowFlowReversal=allowFlowReversalBui)
     "Building model "
     annotation (Placement(transformation(extent={{-30,8},{30,68}})));
-  replaceable Buildings.Experimental.DHC.EnergyTransferStations.BaseClasses.PartialETS ets(
+  replaceable Buildings.DHC.ETS.BaseClasses.PartialETS ets(
     redeclare final package MediumBui=MediumBui,
     redeclare final package MediumSer=MediumSer,
     redeclare final package MediumSerHea_a=MediumSerHea_a,
@@ -262,43 +262,43 @@ partial model PartialBuildingWithPartialETS
     redeclare final package Medium = MediumSer,
     final k=1/facMul,
     final allowFlowReversal=allowFlowReversalSer)
- if typ == Buildings.Experimental.DHC.Types.DistrictSystemType.CombinedGeneration5 "Mass flow rate multiplier"
+ if typ == Buildings.DHC.Types.DistrictSystemType.CombinedGeneration5 "Mass flow rate multiplier"
     annotation (Placement(transformation(extent={{-280,-210},{-260,-190}})));
   Fluid.BaseClasses.MassFlowRateMultiplier mulSerAmbOut(
     redeclare final package Medium = MediumSer,
     final k=facMul,
     final allowFlowReversal=allowFlowReversalSer)
- if typ == Buildings.Experimental.DHC.Types.DistrictSystemType.CombinedGeneration5 "Mass flow rate multiplier"
+ if typ == Buildings.DHC.Types.DistrictSystemType.CombinedGeneration5 "Mass flow rate multiplier"
     annotation (Placement(transformation(extent={{260,-210},{280,-190}})));
   Fluid.BaseClasses.MassFlowRateMultiplier mulSerHeaInl(
     redeclare final package Medium = MediumSerHea_a,
     final k=1/facMul,
     final allowFlowReversal=allowFlowReversalSer)
- if typ <> Buildings.Experimental.DHC.Types.DistrictSystemType.Cooling and
-    typ <> Buildings.Experimental.DHC.Types.DistrictSystemType.CombinedGeneration5 "Mass flow rate multiplier"
+ if typ <> Buildings.DHC.Types.DistrictSystemType.Cooling and
+    typ <> Buildings.DHC.Types.DistrictSystemType.CombinedGeneration5 "Mass flow rate multiplier"
     annotation (Placement(transformation(extent={{-280,-250},{-260,-230}})));
   Fluid.BaseClasses.MassFlowRateMultiplier mulSerHeaOut(
     redeclare final package Medium = MediumSer,
     final k=facMul,
     final allowFlowReversal=allowFlowReversalSer)
- if typ <> Buildings.Experimental.DHC.Types.DistrictSystemType.Cooling and
-    typ <> Buildings.Experimental.DHC.Types.DistrictSystemType.CombinedGeneration5 "Mass flow rate multiplier"
+ if typ <> Buildings.DHC.Types.DistrictSystemType.Cooling and
+    typ <> Buildings.DHC.Types.DistrictSystemType.CombinedGeneration5 "Mass flow rate multiplier"
     annotation (Placement(transformation(extent={{260,-250},{280,-230}})));
   Fluid.BaseClasses.MassFlowRateMultiplier mulSerCooInl(
     redeclare final package Medium = MediumSer,
     final k=1/facMul,
     final allowFlowReversal=allowFlowReversalSer)
- if typ == Buildings.Experimental.DHC.Types.DistrictSystemType.CombinedGeneration1 or
-    typ == Buildings.Experimental.DHC.Types.DistrictSystemType.CombinedGeneration2to4 or
-    typ == Buildings.Experimental.DHC.Types.DistrictSystemType.Cooling "Mass flow rate multiplier"
+ if typ == Buildings.DHC.Types.DistrictSystemType.CombinedGeneration1 or
+    typ == Buildings.DHC.Types.DistrictSystemType.CombinedGeneration2to4 or
+    typ == Buildings.DHC.Types.DistrictSystemType.Cooling "Mass flow rate multiplier"
     annotation (Placement(transformation(extent={{-280,-290},{-260,-270}})));
   Fluid.BaseClasses.MassFlowRateMultiplier mulSerCooOut(
     redeclare final package Medium = MediumSer,
     final k=facMul,
     final allowFlowReversal=allowFlowReversalSer)
- if typ == Buildings.Experimental.DHC.Types.DistrictSystemType.CombinedGeneration1 or
-    typ == Buildings.Experimental.DHC.Types.DistrictSystemType.CombinedGeneration2to4 or
-    typ == Buildings.Experimental.DHC.Types.DistrictSystemType.Cooling "Mass flow rate multiplier"
+ if typ == Buildings.DHC.Types.DistrictSystemType.CombinedGeneration1 or
+    typ == Buildings.DHC.Types.DistrictSystemType.CombinedGeneration2to4 or
+    typ == Buildings.DHC.Types.DistrictSystemType.Cooling "Mass flow rate multiplier"
     annotation (Placement(transformation(extent={{260,-290},{280,-270}})));
   Buildings.Controls.OBC.CDL.Reals.MultiplyByParameter mulQFue_flow[nFue](
       u(each final unit="W"), each final k=facMul) if nFue > 0 "Scaling"
@@ -428,15 +428,15 @@ equation
           pattern=LinePattern.None,
           fillColor={0,255,255},
           fillPattern=FillPattern.Solid,
-          visible=typ == Buildings.Experimental.DHC.Types.DistrictSystemType.CombinedGeneration5),
+          visible=typ == Buildings.DHC.Types.DistrictSystemType.CombinedGeneration5),
         Rectangle(
           extent={{-100,-86},{-22,-74}},
           lineColor={0,0,255},
           pattern=LinePattern.None,
           fillColor={0,0,255},
           fillPattern=FillPattern.Solid,
-          visible=typ == Buildings.Experimental.DHC.Types.DistrictSystemType.CombinedGeneration1 or typ == Buildings.Experimental.DHC.Types.DistrictSystemType.CombinedGeneration2to4
-               or typ == Buildings.Experimental.DHC.Types.DistrictSystemType.Cooling),
+          visible=typ == Buildings.DHC.Types.DistrictSystemType.CombinedGeneration1 or typ == Buildings.DHC.Types.DistrictSystemType.CombinedGeneration2to4
+               or typ == Buildings.DHC.Types.DistrictSystemType.Cooling),
         Polygon(
           points={{0,74},{-40,54},{40,54},{0,74}},
           lineColor={95,95,95},
@@ -477,14 +477,14 @@ equation
           pattern=LinePattern.None,
           fillColor={0,255,255},
           fillPattern=FillPattern.Solid,
-          visible=typ == Buildings.Experimental.DHC.Types.DistrictSystemType.CombinedGeneration5),
+          visible=typ == Buildings.DHC.Types.DistrictSystemType.CombinedGeneration5),
         Rectangle(
           extent={{-11,6},{11,-6}},
           lineColor={0,0,255},
           pattern=LinePattern.None,
           fillColor={0,255,255},
           fillPattern=FillPattern.Solid,
-          visible=typ == Buildings.Experimental.DHC.Types.DistrictSystemType.CombinedGeneration5,
+          visible=typ == Buildings.DHC.Types.DistrictSystemType.CombinedGeneration5,
           origin={66,-17},
           rotation=-90),
         Rectangle(
@@ -493,14 +493,14 @@ equation
           pattern=LinePattern.None,
           fillColor={0,255,255},
           fillPattern=FillPattern.Solid,
-          visible=typ == Buildings.Experimental.DHC.Types.DistrictSystemType.CombinedGeneration5),
+          visible=typ == Buildings.DHC.Types.DistrictSystemType.CombinedGeneration5),
         Rectangle(
           extent={{-11,6},{11,-6}},
           lineColor={0,0,255},
           pattern=LinePattern.None,
           fillColor={0,255,255},
           fillPattern=FillPattern.Solid,
-          visible=typ == Buildings.Experimental.DHC.Types.DistrictSystemType.CombinedGeneration5,
+          visible=typ == Buildings.DHC.Types.DistrictSystemType.CombinedGeneration5,
           origin={-66,-17},
           rotation=-90),
         Rectangle(
@@ -509,29 +509,29 @@ equation
           pattern=LinePattern.None,
           fillColor={0,255,255},
           fillPattern=FillPattern.Solid,
-          visible=typ == Buildings.Experimental.DHC.Types.DistrictSystemType.CombinedGeneration5),
+          visible=typ == Buildings.DHC.Types.DistrictSystemType.CombinedGeneration5),
         Rectangle(
           extent={{40,-34},{100,-46}},
           lineColor={0,0,255},
           pattern=LinePattern.None,
           fillColor={255,0,0},
           fillPattern=FillPattern.Solid,
-          visible=typ <> Buildings.Experimental.DHC.Types.DistrictSystemType.Cooling and typ <> Buildings.Experimental.DHC.Types.DistrictSystemType.CombinedGeneration5),
+          visible=typ <> Buildings.DHC.Types.DistrictSystemType.Cooling and typ <> Buildings.DHC.Types.DistrictSystemType.CombinedGeneration5),
         Rectangle(
           extent={{-100,-34},{-40,-46}},
           lineColor={0,0,255},
           pattern=LinePattern.None,
           fillColor={255,0,0},
           fillPattern=FillPattern.Solid,
-          visible=typ <> Buildings.Experimental.DHC.Types.DistrictSystemType.Cooling and typ <> Buildings.Experimental.DHC.Types.DistrictSystemType.CombinedGeneration5),
+          visible=typ <> Buildings.DHC.Types.DistrictSystemType.Cooling and typ <> Buildings.DHC.Types.DistrictSystemType.CombinedGeneration5),
         Rectangle(
           extent={{-14,-6},{14,6}},
           lineColor={0,0,255},
           pattern=LinePattern.None,
           fillColor={0,0,255},
           fillPattern=FillPattern.Solid,
-          visible=typ == Buildings.Experimental.DHC.Types.DistrictSystemType.CombinedGeneration1 or typ == Buildings.Experimental.DHC.Types.DistrictSystemType.CombinedGeneration2to4
-               or typ == Buildings.Experimental.DHC.Types.DistrictSystemType.Cooling,
+          visible=typ == Buildings.DHC.Types.DistrictSystemType.CombinedGeneration1 or typ == Buildings.DHC.Types.DistrictSystemType.CombinedGeneration2to4
+               or typ == Buildings.DHC.Types.DistrictSystemType.Cooling,
           origin={-28,-60},
           rotation=90),
         Rectangle(
@@ -542,16 +542,16 @@ equation
           fillPattern=FillPattern.Solid,
           origin={28,-60},
           rotation=90,
-          visible=typ == Buildings.Experimental.DHC.Types.DistrictSystemType.CombinedGeneration1 or typ == Buildings.Experimental.DHC.Types.DistrictSystemType.CombinedGeneration2to4
-               or typ == Buildings.Experimental.DHC.Types.DistrictSystemType.Cooling),
+          visible=typ == Buildings.DHC.Types.DistrictSystemType.CombinedGeneration1 or typ == Buildings.DHC.Types.DistrictSystemType.CombinedGeneration2to4
+               or typ == Buildings.DHC.Types.DistrictSystemType.Cooling),
         Rectangle(
           extent={{22,-86},{100,-74}},
           lineColor={0,0,255},
           pattern=LinePattern.None,
           fillColor={0,0,255},
           fillPattern=FillPattern.Solid,
-          visible=typ == Buildings.Experimental.DHC.Types.DistrictSystemType.CombinedGeneration1 or typ == Buildings.Experimental.DHC.Types.DistrictSystemType.CombinedGeneration2to4
-               or typ == Buildings.Experimental.DHC.Types.DistrictSystemType.Cooling)}),
+          visible=typ == Buildings.DHC.Types.DistrictSystemType.CombinedGeneration1 or typ == Buildings.DHC.Types.DistrictSystemType.CombinedGeneration2to4
+               or typ == Buildings.DHC.Types.DistrictSystemType.Cooling)}),
     Diagram(
       coordinateSystem(
         preserveAspectRatio=false,
@@ -564,13 +564,13 @@ Partial model to be used for modeling
 <li>
 an energy transfer station and the optional in-building primary systems,
 based on a model extending
-<a href=\"modelica://Buildings.Experimental.DHC.EnergyTransferStations.BaseClasses.PartialETS\">
-Buildings.Experimental.DHC.EnergyTransferStations.BaseClasses.PartialETS</a>, and
+<a href=\"modelica://Buildings.DHC.ETS.BaseClasses.PartialETS\">
+Buildings.DHC.ETS.BaseClasses.PartialETS</a>, and
 </li>
 <li>
 the served building, based on a model extending
-<a href=\"modelica://Buildings.Experimental.DHC.Loads.BaseClasses.PartialBuilding\">
-Buildings.Experimental.DHC.Loads.BaseClasses.PartialBuilding</a>.
+<a href=\"modelica://Buildings.DHC.Loads.BaseClasses.PartialBuilding\">
+Buildings.DHC.Loads.BaseClasses.PartialBuilding</a>.
 </li>
 </ul>
 <p>
@@ -605,7 +605,7 @@ served by the same service line.
 <p>
 <br/>
 <img alt=\"image\"
-src=\"modelica://Buildings/Resources/Images/Experimental/DHC/Loads/PartialBuildingWithPartialETS.png\"/>
+src=\"modelica://Buildings/Resources/Images/DHC/Loads/PartialBuildingWithPartialETS.png\"/>
 </p>
 </html>",
       revisions="<html>
diff --git a/Buildings/Experimental/DHC/Loads/BaseClasses/Examples/BaseClasses/PartialFanCoil4Pipe.mo b/Buildings/DHC/Loads/BaseClasses/PartialFanCoil4Pipe.mo
similarity index 96%
rename from Buildings/Experimental/DHC/Loads/BaseClasses/Examples/BaseClasses/PartialFanCoil4Pipe.mo
rename to Buildings/DHC/Loads/BaseClasses/PartialFanCoil4Pipe.mo
index 85797e5d8ca..2c7eb6558ab 100644
--- a/Buildings/Experimental/DHC/Loads/BaseClasses/Examples/BaseClasses/PartialFanCoil4Pipe.mo
+++ b/Buildings/DHC/Loads/BaseClasses/PartialFanCoil4Pipe.mo
@@ -1,7 +1,7 @@
-within Buildings.Experimental.DHC.Loads.BaseClasses.Examples.BaseClasses;
+within Buildings.DHC.Loads.BaseClasses;
 partial model PartialFanCoil4Pipe
   "Partial model of a sensible only four-pipe fan coil unit computing a required water mass flow rate"
-  extends Buildings.Experimental.DHC.Loads.BaseClasses.PartialTerminalUnit(
+  extends Buildings.DHC.Loads.BaseClasses.PartialTerminalUnit(
     redeclare package Medium1=Buildings.Media.Water,
     redeclare package Medium2=Buildings.Media.Air,
     final have_heaWat=true,
@@ -145,8 +145,8 @@ equation
 This is a simplified partial model of a sensible only four-pipe fan coil unit
 for heating and cooling.
 It is intended to be used in conjunction with
-<a href=\"modelica://Buildings.Experimental.DHC.Loads.BaseClasses.FlowDistribution\">
-Buildings.Experimental.DHC.Loads.BaseClasses.FlowDistribution</a>,
+<a href=\"modelica://Buildings.DHC.Loads.BaseClasses.FlowDistribution\">
+Buildings.DHC.Loads.BaseClasses.FlowDistribution</a>,
 and hence it computes the water mass flow rate required to meet the temperature
 set point.
 </p>
diff --git a/Buildings/Experimental/DHC/Loads/BaseClasses/PartialTerminalUnit.mo b/Buildings/DHC/Loads/BaseClasses/PartialTerminalUnit.mo
similarity index 95%
rename from Buildings/Experimental/DHC/Loads/BaseClasses/PartialTerminalUnit.mo
rename to Buildings/DHC/Loads/BaseClasses/PartialTerminalUnit.mo
index a9e2fcce411..05624dd200a 100644
--- a/Buildings/Experimental/DHC/Loads/BaseClasses/PartialTerminalUnit.mo
+++ b/Buildings/DHC/Loads/BaseClasses/PartialTerminalUnit.mo
@@ -1,4 +1,4 @@
-within Buildings.Experimental.DHC.Loads.BaseClasses;
+within Buildings.DHC.Loads.BaseClasses;
 partial model PartialTerminalUnit
   "Partial model for HVAC terminal unit"
   replaceable package Medium1=Buildings.Media.Water
@@ -424,14 +424,14 @@ Partial model to be used for modeling an HVAC terminal unit.
 </p>
 <p>
 The models inheriting from this class are typically used in conjunction with
-<a href=\"modelica://Buildings.Experimental.DHC.Loads.BaseClasses.FlowDistribution\">
-Buildings.Experimental.DHC.Loads.BaseClasses.FlowDistribution</a>. They must
+<a href=\"modelica://Buildings.DHC.Loads.BaseClasses.FlowDistribution\">
+Buildings.DHC.Loads.BaseClasses.FlowDistribution</a>. They must
 compute a so-called required mass flow rate defined as the heating or chilled
 water mass flow rate needed to meet the load.
 It can be approximated using a control loop to avoid inverting a heat
 exchanger model as illustrated in
-<a href=\"modelica://Buildings.Experimental.DHC.Loads.BaseClasses.Examples\">
-Buildings.Experimental.DHC.Loads.BaseClasses.Examples</a>.
+<a href=\"modelica://Buildings.DHC.Loads.BaseClasses.Examples\">
+Buildings.DHC.Loads.BaseClasses.Examples</a>.
 </p>
 <p>
 The model connectivity can be modified to address various use cases:
@@ -439,8 +439,8 @@ The model connectivity can be modified to address various use cases:
 <ul>
 <li>
 On the source side (typically connected to
-<a href=\"modelica://Buildings.Experimental.DHC.Loads.BaseClasses.FlowDistribution\">
-Buildings.Experimental.DHC.Loads.BaseClasses.FlowDistribution</a>):
+<a href=\"modelica://Buildings.DHC.Loads.BaseClasses.FlowDistribution\">
+Buildings.DHC.Loads.BaseClasses.FlowDistribution</a>):
 <ul>
 <li>
 Fluid ports for chilled water and heating water can be conditionally
@@ -464,12 +464,12 @@ can be conditionally instantiated by setting <code>have_heaPor</code> to true.
 Real input connectors can be conditionally instantiated by setting
 <code>have_QReq_flow</code> to true. Those connectors can be used to provide
 heating and cooling loads as time series, see
-<a href=\"modelica://Buildings.Experimental.DHC.Loads.BaseClasses.Examples.CouplingTimeSeries\">
-Buildings.Experimental.DHC.Loads.BaseClasses.Examples.CouplingTimeSeries</a>
+<a href=\"modelica://Buildings.DHC.Loads.BaseClasses.Examples.CouplingTimeSeries\">
+Buildings.DHC.Loads.BaseClasses.Examples.CouplingTimeSeries</a>
 for an illustration of that use case.
 The impact on the room air temperature of an unmet load can be assessed with
-<a href=\"modelica://Buildings.Experimental.DHC.Loads.BaseClasses.SimpleRoomODE\">
-Buildings.Experimental.DHC.Loads.BaseClasses.SimpleRoomODE</a>.
+<a href=\"modelica://Buildings.DHC.Loads.BaseClasses.SimpleRoomODE\">
+Buildings.DHC.Loads.BaseClasses.SimpleRoomODE</a>.
 </li>
 </ul>
 </li>
@@ -482,22 +482,22 @@ an infinite capacity.
 <h4>Connection with the flow distribution model</h4>
 <p>
 When connecting the model to
-<a href=\"modelica://Buildings.Experimental.DHC.Loads.BaseClasses.FlowDistribution\">
-Buildings.Experimental.DHC.Loads.BaseClasses.FlowDistribution</a>:
+<a href=\"modelica://Buildings.DHC.Loads.BaseClasses.FlowDistribution\">
+Buildings.DHC.Loads.BaseClasses.FlowDistribution</a>:
 </p>
 <ul>
 <li>
 The nominal pressure drop on the source side (heating or chilled water) is
 irrelevant as the computation of the pump head relies on a specific algorithm
 described in
-<a href=\"modelica://Buildings.Experimental.DHC.Loads.BaseClasses.FlowDistribution\">
-Buildings.Experimental.DHC.Loads.BaseClasses.FlowDistribution</a>.
+<a href=\"modelica://Buildings.DHC.Loads.BaseClasses.FlowDistribution\">
+Buildings.DHC.Loads.BaseClasses.FlowDistribution</a>.
 </li>
 <li>
 The parameter <code>allowFlowReversal</code> must be set to <code>false</code> (default)
 in consistency with
-<a href=\"modelica://Buildings.Experimental.DHC.Loads.BaseClasses.FlowDistribution\">
-Buildings.Experimental.DHC.Loads.BaseClasses.FlowDistribution</a>.
+<a href=\"modelica://Buildings.DHC.Loads.BaseClasses.FlowDistribution\">
+Buildings.DHC.Loads.BaseClasses.FlowDistribution</a>.
 This requirement only applies to the source side.
 On the load side one is free to use whatever option suitable for the modeling needs.
 Note that typically for an air flow network connected to the outdoor air
@@ -542,8 +542,8 @@ Both multiplier factors are of type real (as opposed to integer) to allow
 for instance modeling a set of terminal units based on manufacturer data,
 while still being able to size the full set based on a peak load.
 See
-<a href=\"modelica://Buildings.Experimental.DHC.Loads.BaseClasses.Validation.TerminalUnitScaling\">
-Buildings.Experimental.DHC.Loads.BaseClasses.Validation.TerminalUnitScaling</a>
+<a href=\"modelica://Buildings.DHC.Loads.BaseClasses.Validation.TerminalUnitScaling\">
+Buildings.DHC.Loads.BaseClasses.Validation.TerminalUnitScaling</a>
 for an illustration of the use case when heating and cooling loads are
 provided as time series.
 </p>
diff --git a/Buildings/Experimental/DHC/Loads/BaseClasses/SimpleRoomODE.mo b/Buildings/DHC/Loads/BaseClasses/SimpleRoomODE.mo
similarity index 99%
rename from Buildings/Experimental/DHC/Loads/BaseClasses/SimpleRoomODE.mo
rename to Buildings/DHC/Loads/BaseClasses/SimpleRoomODE.mo
index 9b05a5d78b7..b3b19514943 100644
--- a/Buildings/Experimental/DHC/Loads/BaseClasses/SimpleRoomODE.mo
+++ b/Buildings/DHC/Loads/BaseClasses/SimpleRoomODE.mo
@@ -1,4 +1,4 @@
-within Buildings.Experimental.DHC.Loads.BaseClasses;
+within Buildings.DHC.Loads.BaseClasses;
 model SimpleRoomODE
   "Simplified model for assessing room air temperature variations around a set point"
   extends Modelica.Blocks.Icons.Block;
diff --git a/Buildings/Experimental/DHC/Loads/BaseClasses/Types.mo b/Buildings/DHC/Loads/BaseClasses/Types.mo
similarity index 98%
rename from Buildings/Experimental/DHC/Loads/BaseClasses/Types.mo
rename to Buildings/DHC/Loads/BaseClasses/Types.mo
index 70063593150..b6839f8b12d 100644
--- a/Buildings/Experimental/DHC/Loads/BaseClasses/Types.mo
+++ b/Buildings/DHC/Loads/BaseClasses/Types.mo
@@ -1,4 +1,4 @@
-within Buildings.Experimental.DHC.Loads.BaseClasses;
+within Buildings.DHC.Loads.BaseClasses;
 package Types
   "Package with type definitions"
   extends Modelica.Icons.TypesPackage;
diff --git a/Buildings/Experimental/DHC/Loads/BaseClasses/Validation/BaseClasses/Building.mo b/Buildings/DHC/Loads/BaseClasses/Validation/BaseClasses/Building.mo
similarity index 93%
rename from Buildings/Experimental/DHC/Loads/BaseClasses/Validation/BaseClasses/Building.mo
rename to Buildings/DHC/Loads/BaseClasses/Validation/BaseClasses/Building.mo
index 1d257170de3..956c4d7a424 100644
--- a/Buildings/Experimental/DHC/Loads/BaseClasses/Validation/BaseClasses/Building.mo
+++ b/Buildings/DHC/Loads/BaseClasses/Validation/BaseClasses/Building.mo
@@ -1,7 +1,7 @@
-within Buildings.Experimental.DHC.Loads.BaseClasses.Validation.BaseClasses;
+within Buildings.DHC.Loads.BaseClasses.Validation.BaseClasses;
 model Building
   "Dummy building model for validation purposes"
-  extends Buildings.Experimental.DHC.Loads.BaseClasses.PartialBuilding;
+  extends Buildings.DHC.Loads.BaseClasses.PartialBuilding;
   parameter Modelica.Units.SI.HeatFlowRate QChiWat_flow_nominal
     "Design heat flow rate for chilled water production (<0)"
     annotation (Dialog(group="Nominal condition", enable=have_chiWat));
@@ -87,8 +87,8 @@ equation
     Documentation(info="<html>
 <p>
 This is a minimum example of a class extending
-<a href=\"modelica://Buildings.Experimental.DHC.Loads.BaseClasses.PartialBuilding\">
-Buildings.Experimental.DHC.Loads.BaseClasses.PartialBuilding</a>
+<a href=\"modelica://Buildings.DHC.Loads.BaseClasses.PartialBuilding\">
+Buildings.DHC.Loads.BaseClasses.PartialBuilding</a>
 developed for testing purposes only.
 </p>
 </html>", revisions="<html>
diff --git a/Buildings/Experimental/DHC/Loads/BaseClasses/Validation/BaseClasses/BuildingWithETS.mo b/Buildings/DHC/Loads/BaseClasses/Validation/BaseClasses/BuildingWithETS.mo
similarity index 68%
rename from Buildings/Experimental/DHC/Loads/BaseClasses/Validation/BaseClasses/BuildingWithETS.mo
rename to Buildings/DHC/Loads/BaseClasses/Validation/BaseClasses/BuildingWithETS.mo
index cb515e9559e..16160bfaa87 100644
--- a/Buildings/Experimental/DHC/Loads/BaseClasses/Validation/BaseClasses/BuildingWithETS.mo
+++ b/Buildings/DHC/Loads/BaseClasses/Validation/BaseClasses/BuildingWithETS.mo
@@ -1,8 +1,8 @@
-within Buildings.Experimental.DHC.Loads.BaseClasses.Validation.BaseClasses;
+within Buildings.DHC.Loads.BaseClasses.Validation.BaseClasses;
 model BuildingWithETS
   "Dummy building with ETS model for validation purposes"
   extends
-    Buildings.Experimental.DHC.Loads.BaseClasses.PartialBuildingWithPartialETS(
+    Buildings.DHC.Loads.BaseClasses.PartialBuildingWithPartialETS(
     redeclare ETS ets,
     redeclare Building bui(
       final QChiWat_flow_nominal=QChiWat_flow_nominal,
@@ -18,8 +18,8 @@ model BuildingWithETS
     Documentation(info="<html>
 <p>
 This is a minimum example of a class extending
-<a href=\"modelica://Buildings.Experimental.DHC.Loads.BaseClasses.PartialBuildingWithPartialETS\">
-Buildings.Experimental.DHC.Loads.BaseClasses.PartialBuildingWithPartialETS</a>
+<a href=\"modelica://Buildings.DHC.Loads.BaseClasses.PartialBuildingWithPartialETS\">
+Buildings.DHC.Loads.BaseClasses.PartialBuildingWithPartialETS</a>
 developed for testing purposes only.
 </p>
 </html>", revisions="<html>
diff --git a/Buildings/Experimental/DHC/Loads/BaseClasses/Validation/BaseClasses/ETS.mo b/Buildings/DHC/Loads/BaseClasses/Validation/BaseClasses/ETS.mo
similarity index 84%
rename from Buildings/Experimental/DHC/Loads/BaseClasses/Validation/BaseClasses/ETS.mo
rename to Buildings/DHC/Loads/BaseClasses/Validation/BaseClasses/ETS.mo
index a5273788b12..b01a97106ce 100644
--- a/Buildings/Experimental/DHC/Loads/BaseClasses/Validation/BaseClasses/ETS.mo
+++ b/Buildings/DHC/Loads/BaseClasses/Validation/BaseClasses/ETS.mo
@@ -1,8 +1,8 @@
-within Buildings.Experimental.DHC.Loads.BaseClasses.Validation.BaseClasses;
+within Buildings.DHC.Loads.BaseClasses.Validation.BaseClasses;
 model ETS
   "Dummy ETS model for validation purposes"
   extends
-    Buildings.Experimental.DHC.EnergyTransferStations.BaseClasses.PartialETS;
+    Buildings.DHC.ETS.BaseClasses.PartialETS;
   parameter Modelica.Units.SI.MassFlowRate m_flow_nominal
     "Nominal mass flow rate";
   Buildings.Controls.OBC.CDL.Reals.Sources.Constant souPHea(
@@ -19,26 +19,26 @@ model ETS
     annotation (Placement(transformation(extent={{260,-70},{280,-50}})));
   Fluid.Sources.Boundary_pT sinSerAmbSup(
     redeclare final package Medium = MediumSer,
-    nPorts=1) if typ == Buildings.Experimental.DHC.Types.DistrictSystemType.CombinedGeneration5
+    nPorts=1) if typ == Buildings.DHC.Types.DistrictSystemType.CombinedGeneration5
     "Sink for service supply"
     annotation (Placement(transformation(extent={{-260,-210},{-280,-190}})));
   Fluid.Sources.MassFlowSource_T souSerAmbRet(
     redeclare final package Medium = MediumSer,
     m_flow=m_flow_nominal,
-    nPorts=1) if typ == Buildings.Experimental.DHC.Types.DistrictSystemType.CombinedGeneration5
+    nPorts=1) if typ == Buildings.DHC.Types.DistrictSystemType.CombinedGeneration5
     "Source for service return"
     annotation (Placement(transformation(extent={{260,-210},{280,-190}})));
   Fluid.Sources.Boundary_pT sinSerHeaSup(
     redeclare final package Medium = MediumSerHea_a,
-    nPorts=1) if typ <> Buildings.Experimental.DHC.Types.DistrictSystemType.Cooling and
-    typ <> Buildings.Experimental.DHC.Types.DistrictSystemType.CombinedGeneration5
+    nPorts=1) if typ <> Buildings.DHC.Types.DistrictSystemType.Cooling and
+    typ <> Buildings.DHC.Types.DistrictSystemType.CombinedGeneration5
     "Sink for service supply"
     annotation (Placement(transformation(extent={{-260,-250},{-280,-230}})));
   Fluid.Sources.MassFlowSource_T souSerHeaReat(
     redeclare final package Medium = MediumSer,
     m_flow=m_flow_nominal,
-    nPorts=1) if typ <> Buildings.Experimental.DHC.Types.DistrictSystemType.Cooling and
-    typ <> Buildings.Experimental.DHC.Types.DistrictSystemType.CombinedGeneration5
+    nPorts=1) if typ <> Buildings.DHC.Types.DistrictSystemType.Cooling and
+    typ <> Buildings.DHC.Types.DistrictSystemType.CombinedGeneration5
     "Source for service return"
     annotation (Placement(transformation(extent={{260,-250},{280,-230}})));
   Fluid.Sources.Boundary_pT sinHeaWat(
@@ -100,8 +100,8 @@ equation
     Documentation(info="<html>
 <p>
 This is a minimum example of a class extending
-<a href=\"modelica://Buildings.Experimental.DHC.EnergyTransferStations.BaseClasses.PartialETS\">
-Buildings.Experimental.DHC.EnergyTransferStations.BaseClasses.PartialETS</a>
+<a href=\"modelica://Buildings.DHC.ETS.BaseClasses.PartialETS\">
+Buildings.DHC.ETS.BaseClasses.PartialETS</a>
 developed for testing purposes only.
 </p>
 </html>", revisions="<html>
diff --git a/Buildings/Experimental/DHC/Loads/BaseClasses/Validation/BaseClasses/FanCoil2PipeCooling.mo b/Buildings/DHC/Loads/BaseClasses/Validation/BaseClasses/FanCoil2PipeCooling.mo
similarity index 95%
rename from Buildings/Experimental/DHC/Loads/BaseClasses/Validation/BaseClasses/FanCoil2PipeCooling.mo
rename to Buildings/DHC/Loads/BaseClasses/Validation/BaseClasses/FanCoil2PipeCooling.mo
index 52b56f0332d..4c7968501c3 100644
--- a/Buildings/Experimental/DHC/Loads/BaseClasses/Validation/BaseClasses/FanCoil2PipeCooling.mo
+++ b/Buildings/DHC/Loads/BaseClasses/Validation/BaseClasses/FanCoil2PipeCooling.mo
@@ -1,8 +1,8 @@
-within Buildings.Experimental.DHC.Loads.BaseClasses.Validation.BaseClasses;
+within Buildings.DHC.Loads.BaseClasses.Validation.BaseClasses;
 model FanCoil2PipeCooling
   "Model of a sensible only two-pipe fan coil unit for cooling,
   computing a required chilled water mass flow rate"
-  extends Buildings.Experimental.DHC.Loads.BaseClasses.PartialTerminalUnit(
+  extends Buildings.DHC.Loads.BaseClasses.PartialTerminalUnit(
     redeclare package Medium1=Buildings.Media.Water,
     redeclare package Medium2=Buildings.Media.Air,
     final have_heaPor=false,
@@ -98,7 +98,7 @@ model FanCoil2PipeCooling
     nPorts=1)
     "Source for return air"
     annotation (Placement(transformation(extent={{10,-10},{-10,10}},rotation=0,origin={112,0})));
-  Buildings.Experimental.DHC.Loads.BaseClasses.SimpleRoomODE TLoaODE(
+  Buildings.DHC.Loads.BaseClasses.SimpleRoomODE TLoaODE(
     final dTEnv_nominal=dTEnv_nominal,
     TAir_start=297.15,
     final QEnv_flow_nominal=QEnv_flow_nominal) "Predicted room air temperature"
@@ -197,8 +197,8 @@ takes the load as an input, and
 </li>
 <li>
 in conjunction with
-<a href=\"modelica://Buildings.Experimental.DHC.Loads.BaseClasses.FlowDistribution\">
-Buildings.Experimental.DHC.Loads.BaseClasses.FlowDistribution</a>:
+<a href=\"modelica://Buildings.DHC.Loads.BaseClasses.FlowDistribution\">
+Buildings.DHC.Loads.BaseClasses.FlowDistribution</a>:
 it therefore computes the water mass flow rate required to meet the load.
 </li>
 </ul>
@@ -218,8 +218,8 @@ the air mass flow rate, from zero to its nominal value.
 <p>
 The controller tracks the load while the impact of an unmet load on the room
 air temperature is assessed with
-<a href=\"modelica://Buildings.Experimental.DHC.Loads.BaseClasses.SimpleRoomODE\">
-Buildings.Experimental.DHC.Loads.BaseClasses.SimpleRoomODE</a>.
+<a href=\"modelica://Buildings.DHC.Loads.BaseClasses.SimpleRoomODE\">
+Buildings.DHC.Loads.BaseClasses.SimpleRoomODE</a>.
 </p>
 </html>",
       revisions="<html>
diff --git a/Buildings/Experimental/DHC/Loads/BaseClasses/Validation/BaseClasses/FanCoil2PipeHeating.mo b/Buildings/DHC/Loads/BaseClasses/Validation/BaseClasses/FanCoil2PipeHeating.mo
similarity index 95%
rename from Buildings/Experimental/DHC/Loads/BaseClasses/Validation/BaseClasses/FanCoil2PipeHeating.mo
rename to Buildings/DHC/Loads/BaseClasses/Validation/BaseClasses/FanCoil2PipeHeating.mo
index cc75c37404d..7b8d1cee688 100644
--- a/Buildings/Experimental/DHC/Loads/BaseClasses/Validation/BaseClasses/FanCoil2PipeHeating.mo
+++ b/Buildings/DHC/Loads/BaseClasses/Validation/BaseClasses/FanCoil2PipeHeating.mo
@@ -1,8 +1,8 @@
-within Buildings.Experimental.DHC.Loads.BaseClasses.Validation.BaseClasses;
+within Buildings.DHC.Loads.BaseClasses.Validation.BaseClasses;
 model FanCoil2PipeHeating
   "Model of a two-pipe fan coil unit for heating,
   computing a required heating water mass flow rate"
-  extends Buildings.Experimental.DHC.Loads.BaseClasses.PartialTerminalUnit(
+  extends Buildings.DHC.Loads.BaseClasses.PartialTerminalUnit(
     redeclare package Medium1=Buildings.Media.Water,
     redeclare package Medium2=Buildings.Media.Air,
     final have_heaPor=false,
@@ -90,7 +90,7 @@ model FanCoil2PipeHeating
     nPorts=1)
     "Source for return air"
     annotation (Placement(transformation(extent={{10,-10},{-10,10}},rotation=0,origin={112,0})));
-  Buildings.Experimental.DHC.Loads.BaseClasses.SimpleRoomODE TLoaODE(
+  Buildings.DHC.Loads.BaseClasses.SimpleRoomODE TLoaODE(
     dTEnv_nominal=25,
     TAir_start=293.15,
     QEnv_flow_nominal=QHea_flow_nominal) "Predicted room air temperature"
@@ -191,8 +191,8 @@ therefore takes the load as an input, and
 </li>
 <li>
 in conjunction with
-<a href=\"modelica://Buildings.Experimental.DHC.Loads.BaseClasses.FlowDistribution\">
-Buildings.Experimental.DHC.Loads.BaseClasses.FlowDistribution</a>:
+<a href=\"modelica://Buildings.DHC.Loads.BaseClasses.FlowDistribution\">
+Buildings.DHC.Loads.BaseClasses.FlowDistribution</a>:
 it therefore computes the water mass flow rate required to meet the load.
 </li>
 </ul>
@@ -212,8 +212,8 @@ the air mass flow rate, from zero to its nominal value.
 <p>
 The controller tracks the load while the impact of an unmet load on the room
 air temperature is assessed with
-<a href=\"modelica://Buildings.Experimental.DHC.Loads.BaseClasses.SimpleRoomODE\">
-Buildings.Experimental.DHC.Loads.BaseClasses.SimpleRoomODE</a>.
+<a href=\"modelica://Buildings.DHC.Loads.BaseClasses.SimpleRoomODE\">
+Buildings.DHC.Loads.BaseClasses.SimpleRoomODE</a>.
 </p>
 </html>", revisions="<html>
 <ul>
diff --git a/Buildings/Experimental/DHC/Loads/BaseClasses/Validation/BaseClasses/FanCoil2PipeHeatingValve.mo b/Buildings/DHC/Loads/BaseClasses/Validation/BaseClasses/FanCoil2PipeHeatingValve.mo
similarity index 96%
rename from Buildings/Experimental/DHC/Loads/BaseClasses/Validation/BaseClasses/FanCoil2PipeHeatingValve.mo
rename to Buildings/DHC/Loads/BaseClasses/Validation/BaseClasses/FanCoil2PipeHeatingValve.mo
index f52dfdde37c..f86d586e07a 100644
--- a/Buildings/Experimental/DHC/Loads/BaseClasses/Validation/BaseClasses/FanCoil2PipeHeatingValve.mo
+++ b/Buildings/DHC/Loads/BaseClasses/Validation/BaseClasses/FanCoil2PipeHeatingValve.mo
@@ -1,7 +1,7 @@
-within Buildings.Experimental.DHC.Loads.BaseClasses.Validation.BaseClasses;
+within Buildings.DHC.Loads.BaseClasses.Validation.BaseClasses;
 model FanCoil2PipeHeatingValve
   "Model of a two-pipe fan coil unit for heating, with a two-way control valve"
-  extends Buildings.Experimental.DHC.Loads.BaseClasses.PartialTerminalUnit(
+  extends Buildings.DHC.Loads.BaseClasses.PartialTerminalUnit(
     redeclare package Medium1=Buildings.Media.Water,
     redeclare package Medium2=Buildings.Media.Air,
     final have_heaPor=false,
@@ -83,7 +83,7 @@ model FanCoil2PipeHeatingValve
     nPorts=1)
     "Source for return air"
     annotation (Placement(transformation(extent={{10,-10},{-10,10}},rotation=0,origin={110,0})));
-  Buildings.Experimental.DHC.Loads.BaseClasses.SimpleRoomODE TLoaODE(
+  Buildings.DHC.Loads.BaseClasses.SimpleRoomODE TLoaODE(
     dTEnv_nominal=25,
     TAir_start=293.15,
     QEnv_flow_nominal=QHea_flow_nominal) "Predicted room air temperature"
@@ -198,8 +198,8 @@ the air mass flow rate, from zero to its nominal value.
 </ul>
 <p>
 The impact of an unmet load on the room air temperature is assessed with
-<a href=\"modelica://Buildings.Experimental.DHC.Loads.BaseClasses.SimpleRoomODE\">
-Buildings.Experimental.DHC.Loads.BaseClasses.SimpleRoomODE</a>.
+<a href=\"modelica://Buildings.DHC.Loads.BaseClasses.SimpleRoomODE\">
+Buildings.DHC.Loads.BaseClasses.SimpleRoomODE</a>.
 </p>
 </html>",
       revisions="<html>
diff --git a/Buildings/Experimental/DHC/Loads/BaseClasses/Validation/BaseClasses/package.mo b/Buildings/DHC/Loads/BaseClasses/Validation/BaseClasses/package.mo
similarity index 54%
rename from Buildings/Experimental/DHC/Loads/BaseClasses/Validation/BaseClasses/package.mo
rename to Buildings/DHC/Loads/BaseClasses/Validation/BaseClasses/package.mo
index eb602b39ddf..c2cb3ec1522 100644
--- a/Buildings/Experimental/DHC/Loads/BaseClasses/Validation/BaseClasses/package.mo
+++ b/Buildings/DHC/Loads/BaseClasses/Validation/BaseClasses/package.mo
@@ -1,12 +1,12 @@
-within Buildings.Experimental.DHC.Loads.BaseClasses.Validation;
+within Buildings.DHC.Loads.BaseClasses.Validation;
 package BaseClasses "Package with base classes"
   extends Modelica.Icons.BasesPackage;
 
 annotation (Documentation(info="<html>
 <p>
 This package contains base classes that are used to construct the classes in
-<a href=\"modelica://Buildings.Experimental.DHC.Loads.BaseClasses.Validation\">
-Buildings.Experimental.DHC.Loads.BaseClasses.Validation</a>.
+<a href=\"modelica://Buildings.DHC.Loads.BaseClasses.Validation\">
+Buildings.DHC.Loads.BaseClasses.Validation</a>.
 </p>
 </html>"));
 end BaseClasses;
diff --git a/Buildings/Experimental/DHC/Loads/BaseClasses/Validation/BaseClasses/package.order b/Buildings/DHC/Loads/BaseClasses/Validation/BaseClasses/package.order
similarity index 100%
rename from Buildings/Experimental/DHC/Loads/BaseClasses/Validation/BaseClasses/package.order
rename to Buildings/DHC/Loads/BaseClasses/Validation/BaseClasses/package.order
diff --git a/Buildings/Experimental/DHC/Loads/BaseClasses/Validation/BenchmarkFlowDistribution1.mo b/Buildings/DHC/Loads/BaseClasses/Validation/BenchmarkFlowDistribution1.mo
similarity index 85%
rename from Buildings/Experimental/DHC/Loads/BaseClasses/Validation/BenchmarkFlowDistribution1.mo
rename to Buildings/DHC/Loads/BaseClasses/Validation/BenchmarkFlowDistribution1.mo
index 82bf3040132..cfcbb8123f2 100644
--- a/Buildings/Experimental/DHC/Loads/BaseClasses/Validation/BenchmarkFlowDistribution1.mo
+++ b/Buildings/DHC/Loads/BaseClasses/Validation/BenchmarkFlowDistribution1.mo
@@ -1,4 +1,4 @@
-within Buildings.Experimental.DHC.Loads.BaseClasses.Validation;
+within Buildings.DHC.Loads.BaseClasses.Validation;
 model BenchmarkFlowDistribution1
   "Performance benchmark of building heating water flow distribution modeling"
   extends Modelica.Icons.Example;
@@ -6,7 +6,7 @@ model BenchmarkFlowDistribution1
     "Source side medium";
   package Medium2=Buildings.Media.Air
     "Load side medium";
-  parameter String filNam="modelica://Buildings/Resources/Data/Experimental/DHC/Loads/Examples/SwissResidential_20190916.mos"
+  parameter String filNam="modelica://Buildings/Resources/Data/DHC/Loads/Examples/SwissResidential_20190916.mos"
     "File name with thermal loads as time series";
   parameter Integer nLoa=5
     "Number of served loads"
@@ -37,11 +37,11 @@ model BenchmarkFlowDistribution1
   final parameter Modelica.Units.SI.MassFlowRate m_flow_nominal=sum(ter.mHeaWat_flow_nominal)
       *facMul "Nominal mass flow rate in the distribution line";
   final parameter Modelica.Units.SI.HeatFlowRate QHea_flow_nominal(min=Modelica.Constants.eps)
-     = Buildings.Experimental.DHC.Loads.BaseClasses.getPeakLoad(string=
+     = Buildings.DHC.Loads.BaseClasses.getPeakLoad(string=
     "#Peak space heating load", filNam=Modelica.Utilities.Files.loadResource(
     filNam))/facMul "Design heating heat flow rate (>=0)"
     annotation (Dialog(group="Design parameter"));
-  Buildings.Experimental.DHC.Loads.BaseClasses.FlowDistribution disFloHea(
+  Buildings.DHC.Loads.BaseClasses.FlowDistribution disFloHea(
     redeclare package Medium=Medium1,
     m_flow_nominal=m_flow_nominal,
     have_pum=true,
@@ -50,7 +50,7 @@ model BenchmarkFlowDistribution1
     nPorts_b1=nLoa)
     "Heating water distribution system"
     annotation (Placement(transformation(extent={{40,-90},{60,-70}})));
-  Buildings.Experimental.DHC.Loads.BaseClasses.Validation.BaseClasses.FanCoil2PipeHeating ter[nLoa](
+  Buildings.DHC.Loads.BaseClasses.Validation.BaseClasses.FanCoil2PipeHeating ter[nLoa](
     each final facMul=facMul,
     redeclare each final package Medium1=Medium1,
     redeclare each final package Medium2=Medium2,
@@ -135,16 +135,16 @@ This model is part of a computational performance benchmark between
 <ul>
 <li>
 a simplified modeling of the piping network as implemented in
-<a href=\"modelica://Buildings.Experimental.DHC.Loads.BaseClasses.FlowDistribution\">
-Buildings.Experimental.DHC.Loads.BaseClasses.FlowDistribution</a>
+<a href=\"modelica://Buildings.DHC.Loads.BaseClasses.FlowDistribution\">
+Buildings.DHC.Loads.BaseClasses.FlowDistribution</a>
 (see the corresponding example
-<a href=\"modelica://Buildings.Experimental.DHC.Loads.BaseClasses.Validation.BenchmarkFlowDistribution1\">
-Buildings.Experimental.DHC.Loads.BaseClasses.Validation.BenchmarkFlowDistribution1</a>), and
+<a href=\"modelica://Buildings.DHC.Loads.BaseClasses.Validation.BenchmarkFlowDistribution1\">
+Buildings.DHC.Loads.BaseClasses.Validation.BenchmarkFlowDistribution1</a>), and
 </li>
 <li>
 an explicit modeling of the piping network (see the corresponding example
-<a href=\"modelica://Buildings.Experimental.DHC.Loads.BaseClasses.Validation.BenchmarkFlowDistribution2\">
-Buildings.Experimental.DHC.Loads.BaseClasses.Validation.BenchmarkFlowDistribution2</a>).
+<a href=\"modelica://Buildings.DHC.Loads.BaseClasses.Validation.BenchmarkFlowDistribution2\">
+Buildings.DHC.Loads.BaseClasses.Validation.BenchmarkFlowDistribution2</a>).
 </li>
 </ul>
 </html>",
@@ -167,5 +167,5 @@ First implementation.
       StopTime=2000000,
       Tolerance=1e-06),
     __Dymola_Commands(
-      file="modelica://Buildings/Resources/Scripts/Dymola/Experimental/DHC/Loads/BaseClasses/Validation/BenchmarkFlowDistribution1.mos" "Simulate and plot"));
+      file="modelica://Buildings/Resources/Scripts/Dymola/DHC/Loads/BaseClasses/Validation/BenchmarkFlowDistribution1.mos" "Simulate and plot"));
 end BenchmarkFlowDistribution1;
diff --git a/Buildings/Experimental/DHC/Loads/BaseClasses/Validation/BenchmarkFlowDistribution2.mo b/Buildings/DHC/Loads/BaseClasses/Validation/BenchmarkFlowDistribution2.mo
similarity index 87%
rename from Buildings/Experimental/DHC/Loads/BaseClasses/Validation/BenchmarkFlowDistribution2.mo
rename to Buildings/DHC/Loads/BaseClasses/Validation/BenchmarkFlowDistribution2.mo
index ac9651278bd..4589987af33 100644
--- a/Buildings/Experimental/DHC/Loads/BaseClasses/Validation/BenchmarkFlowDistribution2.mo
+++ b/Buildings/DHC/Loads/BaseClasses/Validation/BenchmarkFlowDistribution2.mo
@@ -1,4 +1,4 @@
-within Buildings.Experimental.DHC.Loads.BaseClasses.Validation;
+within Buildings.DHC.Loads.BaseClasses.Validation;
 model BenchmarkFlowDistribution2
   "Performance benchmark of building heating water flow distribution modeling"
   extends Modelica.Icons.Example;
@@ -6,7 +6,7 @@ model BenchmarkFlowDistribution2
     "Source side medium";
   package Medium2=Buildings.Media.Air
     "Load side medium";
-  parameter String filNam="modelica://Buildings/Resources/Data/Experimental/DHC/Loads/Examples/SwissResidential_20190916.mos"
+  parameter String filNam="modelica://Buildings/Resources/Data/DHC/Loads/Examples/SwissResidential_20190916.mos"
     "File name with thermal loads as time series";
   parameter Integer nLoa=5
     "Number of served loads"
@@ -39,11 +39,11 @@ model BenchmarkFlowDistribution2
        + sum(dis.con.pipDisRet.dp_nominal) + max(ter.dpSou_nominal)
     "Nominal pressure drop in the distribution line";
   final parameter Modelica.Units.SI.HeatFlowRate QHea_flow_nominal=
-      Buildings.Experimental.DHC.Loads.BaseClasses.getPeakLoad(string="#Peak space heating load", filNam=
+      Buildings.DHC.Loads.BaseClasses.getPeakLoad(string="#Peak space heating load", filNam=
       Modelica.Utilities.Files.loadResource(filNam))/facMul
     "Design heating heat flow rate (>=0)"
     annotation (Dialog(group="Design parameter"));
-  Buildings.Experimental.DHC.Loads.BaseClasses.Validation.BaseClasses.FanCoil2PipeHeatingValve ter[nLoa](
+  Buildings.DHC.Loads.BaseClasses.Validation.BaseClasses.FanCoil2PipeHeatingValve ter[nLoa](
     each final facMul=facMul,
     redeclare each final package Medium1=Medium1,
     redeclare each final package Medium2=Medium2,
@@ -86,7 +86,7 @@ model BenchmarkFlowDistribution2
     nPorts=2)
     "Heating water supply"
     annotation (Placement(transformation(extent={{-10,-10},{10,10}},rotation=0,origin={-50,-80})));
-  Buildings.Experimental.DHC.Networks.Distribution2Pipe_R dis(
+  Buildings.DHC.Networks.Distribution2Pipe_R dis(
     redeclare final package Medium = Medium1,
     nCon=nLoa,
     allowFlowReversal=false,
@@ -166,16 +166,16 @@ This model is part of a computational performance benchmark between
 <ul>
 <li>
 a simplified modeling of the piping network as implemented in
-<a href=\"modelica://Buildings.Experimental.DHC.Loads.BaseClasses.FlowDistribution\">
-Buildings.Experimental.DHC.Loads.BaseClasses.FlowDistribution</a>
+<a href=\"modelica://Buildings.DHC.Loads.BaseClasses.FlowDistribution\">
+Buildings.DHC.Loads.BaseClasses.FlowDistribution</a>
 (see the corresponding example
-<a href=\"modelica://Buildings.Experimental.DHC.Loads.BaseClasses.Validation.BenchmarkFlowDistribution1\">
-Buildings.Experimental.DHC.Loads.BaseClasses.Validation.BenchmarkFlowDistribution1</a>), and
+<a href=\"modelica://Buildings.DHC.Loads.BaseClasses.Validation.BenchmarkFlowDistribution1\">
+Buildings.DHC.Loads.BaseClasses.Validation.BenchmarkFlowDistribution1</a>), and
 </li>
 <li>
 an explicit modeling of the piping network (see the corresponding example
-<a href=\"modelica://Buildings.Experimental.DHC.Loads.BaseClasses.Validation.BenchmarkFlowDistribution2\">
-Buildings.Experimental.DHC.Loads.BaseClasses.Validation.BenchmarkFlowDistribution2</a>).
+<a href=\"modelica://Buildings.DHC.Loads.BaseClasses.Validation.BenchmarkFlowDistribution2\">
+Buildings.DHC.Loads.BaseClasses.Validation.BenchmarkFlowDistribution2</a>).
 </li>
 </ul>
 </html>",
@@ -198,5 +198,5 @@ First implementation.
         preserveAspectRatio=false,
         extent={{-120,-120},{120,120}})),
     __Dymola_Commands(
-      file="modelica://Buildings/Resources/Scripts/Dymola/Experimental/DHC/Loads/BaseClasses/Validation/BenchmarkFlowDistribution2.mos" "Simulate and plot"));
+      file="modelica://Buildings/Resources/Scripts/Dymola/DHC/Loads/BaseClasses/Validation/BenchmarkFlowDistribution2.mos" "Simulate and plot"));
 end BenchmarkFlowDistribution2;
diff --git a/Buildings/Experimental/DHC/Loads/BaseClasses/Validation/BuildingWithETS.mo b/Buildings/DHC/Loads/BaseClasses/Validation/BuildingWithETS.mo
similarity index 89%
rename from Buildings/Experimental/DHC/Loads/BaseClasses/Validation/BuildingWithETS.mo
rename to Buildings/DHC/Loads/BaseClasses/Validation/BuildingWithETS.mo
index f61a8bcf953..eb01c629893 100644
--- a/Buildings/Experimental/DHC/Loads/BaseClasses/Validation/BuildingWithETS.mo
+++ b/Buildings/DHC/Loads/BaseClasses/Validation/BuildingWithETS.mo
@@ -1,8 +1,8 @@
-within Buildings.Experimental.DHC.Loads.BaseClasses.Validation;
+within Buildings.DHC.Loads.BaseClasses.Validation;
 model BuildingWithETS
   "Validation of the base class PartialBuildingWithPartialETS"
   extends Modelica.Icons.Example;
-  import TypDisSys=Buildings.Experimental.DHC.Types.DistrictSystemType
+  import TypDisSys=Buildings.DHC.Types.DistrictSystemType
     "District system type enumeration";
   package MediumW=Buildings.Media.Water
     "Water";
@@ -15,7 +15,7 @@ model BuildingWithETS
     "Nominal mass flow rate";
   parameter Modelica.Units.SI.HeatFlowRate QChiWat_flow_nominal=-1E4
     "Nominal mass flow rate";
-  Buildings.Experimental.DHC.Loads.BaseClasses.Validation.BaseClasses.BuildingWithETS buiHeaGen1(
+  Buildings.DHC.Loads.BaseClasses.Validation.BaseClasses.BuildingWithETS buiHeaGen1(
     redeclare final package MediumSerHea_a=MediumS,
     redeclare final package MediumSer=MediumW,
     redeclare final package MediumBui=MediumW,
@@ -40,13 +40,13 @@ model BuildingWithETS
     nPorts=1)
     "Sink for district return"
     annotation (Placement(transformation(extent={{-240,170},{-220,190}})));
-  Buildings.Experimental.DHC.Networks.BaseClasses.DifferenceEnthalpyFlowRate senDifEntFlo(
+  Buildings.DHC.Networks.BaseClasses.DifferenceEnthalpyFlowRate senDifEntFlo(
     redeclare final package Medium1=MediumS,
     redeclare final package Medium2=MediumW,
     final m_flow_nominal=m_flow_nominal)
     "Change in enthalpy flow rate "
     annotation (Placement(transformation(extent={{-200,196},{-180,216}})));
-  Buildings.Experimental.DHC.Loads.BaseClasses.Validation.BaseClasses.BuildingWithETS buiComGen1(
+  Buildings.DHC.Loads.BaseClasses.Validation.BaseClasses.BuildingWithETS buiComGen1(
     redeclare final package MediumSerHea_a=MediumS,
     redeclare final package MediumSer=MediumW,
     redeclare final package MediumBui=MediumW,
@@ -62,7 +62,7 @@ model BuildingWithETS
       final have_chiWat=true,
       QHeaWat_flow_nominal=QHeaWat_flow_nominal,
       QChiWat_flow_nominal=QChiWat_flow_nominal))
-    "Building and ETS component - Combined heating (steam) and cooling"
+    "Building and ETS component - Buildings.DHC.Loads.Combined heating (steam) and cooling"
     annotation (Placement(transformation(extent={{-160,-10},{-140,10}})));
   Fluid.Sources.MassFlowSource_T souDisSup1(
     redeclare final package Medium=MediumS,
@@ -75,7 +75,7 @@ model BuildingWithETS
     nPorts=1)
     "Sink for district return"
     annotation (Placement(transformation(extent={{-240,-50},{-220,-30}})));
-  Buildings.Experimental.DHC.Networks.BaseClasses.DifferenceEnthalpyFlowRate senDifEntFlo1(
+  Buildings.DHC.Networks.BaseClasses.DifferenceEnthalpyFlowRate senDifEntFlo1(
     redeclare final package Medium1=MediumS,
     redeclare final package Medium2 = Media.Water,
     final m_flow_nominal=m_flow_nominal)
@@ -92,7 +92,7 @@ model BuildingWithETS
     nPorts=1)
     "Sink for district return"
     annotation (Placement(transformation(extent={{-200,-90},{-180,-70}})));
-  Buildings.Experimental.DHC.Networks.BaseClasses.DifferenceEnthalpyFlowRate senDifEntFlo2(
+  Buildings.DHC.Networks.BaseClasses.DifferenceEnthalpyFlowRate senDifEntFlo2(
     redeclare final package Medium1=MediumW,
     final m_flow_nominal=m_flow_nominal)
     "Change in enthalpy flow rate "
@@ -108,12 +108,12 @@ model BuildingWithETS
     nPorts=1)
     "Sink for district return"
     annotation (Placement(transformation(extent={{-240,50},{-220,70}})));
-  Buildings.Experimental.DHC.Networks.BaseClasses.DifferenceEnthalpyFlowRate senDifEntFlo3(
+  Buildings.DHC.Networks.BaseClasses.DifferenceEnthalpyFlowRate senDifEntFlo3(
     redeclare final package Medium1=MediumW,
     final m_flow_nominal=m_flow_nominal)
     "Change in enthalpy flow rate "
     annotation (Placement(transformation(extent={{-200,76},{-180,96}})));
-  Buildings.Experimental.DHC.Loads.BaseClasses.Validation.BaseClasses.BuildingWithETS buiCoo(
+  Buildings.DHC.Loads.BaseClasses.Validation.BaseClasses.BuildingWithETS buiCoo(
     redeclare final package MediumSer=MediumW,
     redeclare final package MediumBui=MediumW,
     nPorts_chiWat=1,
@@ -124,9 +124,9 @@ model BuildingWithETS
       final m_flow_nominal=m_flow_nominal,
       final have_chiWat=true,
       QChiWat_flow_nominal=QChiWat_flow_nominal))
-    "Building and ETS component - Cooling only"
+    "Building and ETS component - Buildings.DHC.Loads.Cooling only"
     annotation (Placement(transformation(extent={{-160,90},{-140,110}})));
-  Buildings.Experimental.DHC.Loads.BaseClasses.Validation.BaseClasses.BuildingWithETS buiComGen2to4(
+  Buildings.DHC.Loads.BaseClasses.Validation.BaseClasses.BuildingWithETS buiComGen2to4(
     redeclare final package MediumSer = MediumW,
     redeclare final package MediumBui = MediumW,
     nPorts_heaWat=1,
@@ -141,7 +141,7 @@ model BuildingWithETS
       final have_chiWat=true,
       QHeaWat_flow_nominal=QHeaWat_flow_nominal,
       QChiWat_flow_nominal=QChiWat_flow_nominal))
-    "Building and ETS component - Combined heating and cooling"
+    "Building and ETS component - Buildings.DHC.Loads.Combined heating and cooling"
     annotation (Placement(transformation(extent={{0,-10},{20,10}})));
   Fluid.Sources.MassFlowSource_T souDisSup5(
     redeclare final package Medium = MediumW,
@@ -154,7 +154,7 @@ model BuildingWithETS
     nPorts=1)
     "Sink for district return"
     annotation (Placement(transformation(extent={{-80,-50},{-60,-30}})));
-  Buildings.Experimental.DHC.Networks.BaseClasses.DifferenceEnthalpyFlowRate senDifEntFlo5(
+  Buildings.DHC.Networks.BaseClasses.DifferenceEnthalpyFlowRate senDifEntFlo5(
     redeclare final package Medium1 = MediumW,
     final m_flow_nominal=m_flow_nominal)
     "Change in enthalpy flow rate "
@@ -169,12 +169,12 @@ model BuildingWithETS
     nPorts=1)
     "Sink for district return"
     annotation (Placement(transformation(extent={{-40,-90},{-20,-70}})));
-  Buildings.Experimental.DHC.Networks.BaseClasses.DifferenceEnthalpyFlowRate senDifEntFlo6(
+  Buildings.DHC.Networks.BaseClasses.DifferenceEnthalpyFlowRate senDifEntFlo6(
     redeclare final package Medium1 = MediumW,
     final m_flow_nominal=m_flow_nominal)
     "Change in enthalpy flow rate "
     annotation (Placement(transformation(extent={{0,-64},{20,-44}})));
-  Buildings.Experimental.DHC.Loads.BaseClasses.Validation.BaseClasses.BuildingWithETS buiHeaGen2to4(
+  Buildings.DHC.Loads.BaseClasses.Validation.BaseClasses.BuildingWithETS buiHeaGen2to4(
     redeclare final package MediumSer = MediumW,
     redeclare final package MediumBui = MediumW,
     nPorts_heaWat=1,
@@ -198,7 +198,7 @@ model BuildingWithETS
     nPorts=1)
     "Sink for district return"
     annotation (Placement(transformation(extent={{-80,170},{-60,190}})));
-  Buildings.Experimental.DHC.Networks.BaseClasses.DifferenceEnthalpyFlowRate senDifEntFlo7(
+  Buildings.DHC.Networks.BaseClasses.DifferenceEnthalpyFlowRate senDifEntFlo7(
     redeclare final package Medium1 = MediumW,
     final m_flow_nominal=m_flow_nominal)
     "Change in enthalpy flow rate "
@@ -213,11 +213,11 @@ model BuildingWithETS
       nPorts=1)
     "Sink for district return"
     annotation (Placement(transformation(extent={{120,-50},{140,-30}})));
-  Buildings.Experimental.DHC.Networks.BaseClasses.DifferenceEnthalpyFlowRate senDifEntFlo4(redeclare
+  Buildings.DHC.Networks.BaseClasses.DifferenceEnthalpyFlowRate senDifEntFlo4(redeclare
       final package Medium1 = MediumW, final m_flow_nominal=m_flow_nominal)
     "Change in enthalpy flow rate "
     annotation (Placement(transformation(extent={{160,-24},{180,-4}})));
-  Buildings.Experimental.DHC.Loads.BaseClasses.Validation.BaseClasses.BuildingWithETS buiComGen5(
+  Buildings.DHC.Loads.BaseClasses.Validation.BaseClasses.BuildingWithETS buiComGen5(
     redeclare final package MediumSer = MediumW,
     redeclare final package MediumBui = MediumW,
     nPorts_heaWat=1,
@@ -230,7 +230,7 @@ model BuildingWithETS
       final have_chiWat=true,
       QHeaWat_flow_nominal=QHeaWat_flow_nominal,
       QChiWat_flow_nominal=QChiWat_flow_nominal))
-    "Building and ETS component - Combined heating and cooling (ambient)"
+    "Building and ETS component - Buildings.DHC.Loads.Combined heating and cooling (ambient)"
     annotation (Placement(transformation(extent={{200,-10},{220,10}})));
   Fluid.Sources.MassFlowSource_T souDisSup8(
     redeclare final package Medium = MediumW,
@@ -242,11 +242,11 @@ model BuildingWithETS
       nPorts=1)
     "Sink for district return"
     annotation (Placement(transformation(extent={{-240,-210},{-220,-190}})));
-  Buildings.Experimental.DHC.Networks.BaseClasses.DifferenceEnthalpyFlowRate senDifEntFlo8(redeclare
+  Buildings.DHC.Networks.BaseClasses.DifferenceEnthalpyFlowRate senDifEntFlo8(redeclare
       final package Medium1 = MediumW, final m_flow_nominal=m_flow_nominal)
     "Change in enthalpy flow rate "
     annotation (Placement(transformation(extent={{-200,-184},{-180,-164}})));
-  Buildings.Experimental.DHC.Loads.BaseClasses.Validation.BaseClasses.BuildingWithETS buiTesOutETS(
+  Buildings.DHC.Loads.BaseClasses.Validation.BaseClasses.BuildingWithETS buiTesOutETS(
     redeclare final package MediumSer = MediumW,
     redeclare final package MediumBui = MediumW,
     nPorts_heaWat=1,
@@ -275,11 +275,11 @@ model BuildingWithETS
       nPorts=1)
     "Sink for district return"
     annotation (Placement(transformation(extent={{-80,-210},{-60,-190}})));
-  Buildings.Experimental.DHC.Networks.BaseClasses.DifferenceEnthalpyFlowRate senDifEntFlo9(redeclare
+  Buildings.DHC.Networks.BaseClasses.DifferenceEnthalpyFlowRate senDifEntFlo9(redeclare
       final package Medium1 = MediumW, final m_flow_nominal=m_flow_nominal)
     "Change in enthalpy flow rate "
     annotation (Placement(transformation(extent={{-40,-184},{-20,-164}})));
-  Buildings.Experimental.DHC.Loads.BaseClasses.Validation.BaseClasses.BuildingWithETS buiTesOutETSBui(
+  Buildings.DHC.Loads.BaseClasses.Validation.BaseClasses.BuildingWithETS buiTesOutETSBui(
     redeclare final package MediumSer = MediumW,
     redeclare final package MediumBui = MediumW,
     nPorts_heaWat=1,
@@ -314,11 +314,11 @@ model BuildingWithETS
         MediumW, nPorts=1)
     "Sink for district return"
     annotation (Placement(transformation(extent={{100,-210},{120,-190}})));
-  Buildings.Experimental.DHC.Networks.BaseClasses.DifferenceEnthalpyFlowRate senDifEntFlo10(redeclare
+  Buildings.DHC.Networks.BaseClasses.DifferenceEnthalpyFlowRate senDifEntFlo10(redeclare
       final package Medium1 = MediumW, final m_flow_nominal=m_flow_nominal)
     "Change in enthalpy flow rate "
     annotation (Placement(transformation(extent={{140,-184},{160,-164}})));
-  Buildings.Experimental.DHC.Loads.BaseClasses.Validation.BaseClasses.BuildingWithETS buiTesFacMul(
+  Buildings.DHC.Loads.BaseClasses.Validation.BaseClasses.BuildingWithETS buiTesFacMul(
     redeclare final package MediumSer = MediumW,
     redeclare final package MediumBui = MediumW,
     nPorts_heaWat=1,
@@ -451,7 +451,7 @@ equation
       Tolerance=1e-6,
       StopTime=1.0),
     __Dymola_Commands(
-      file="modelica://Buildings/Resources/Scripts/Dymola/Experimental/DHC/Loads/BaseClasses/Validation/BuildingWithETS.mos"
+      file="modelica://Buildings/Resources/Scripts/Dymola/DHC/Loads/BaseClasses/Validation/BuildingWithETS.mos"
       "Simulate and plot"),
     Icon(
       coordinateSystem(
@@ -463,8 +463,8 @@ equation
     Documentation(info="<html>
 <p>
 This model validates
-<a href=\"modelica://Buildings.Experimental.DHC.Loads.BaseClasses.PartialBuildingWithPartialETS\">
-Buildings.Experimental.DHC.Loads.BaseClasses.PartialBuildingWithPartialETS</a>
+<a href=\"modelica://Buildings.DHC.Loads.BaseClasses.PartialBuildingWithPartialETS\">
+Buildings.DHC.Loads.BaseClasses.PartialBuildingWithPartialETS</a>
 for various types of district system.
 </p>
 </html>", revisions="<html>
diff --git a/Buildings/Experimental/DHC/Loads/BaseClasses/Validation/FlowDistributionPumpControl.mo b/Buildings/DHC/Loads/BaseClasses/Validation/FlowDistributionPumpControl.mo
similarity index 92%
rename from Buildings/Experimental/DHC/Loads/BaseClasses/Validation/FlowDistributionPumpControl.mo
rename to Buildings/DHC/Loads/BaseClasses/Validation/FlowDistributionPumpControl.mo
index f9b9abafa6e..81451c4fee5 100644
--- a/Buildings/Experimental/DHC/Loads/BaseClasses/Validation/FlowDistributionPumpControl.mo
+++ b/Buildings/DHC/Loads/BaseClasses/Validation/FlowDistributionPumpControl.mo
@@ -1,4 +1,4 @@
-within Buildings.Experimental.DHC.Loads.BaseClasses.Validation;
+within Buildings.DHC.Loads.BaseClasses.Validation;
 model FlowDistributionPumpControl
   "Validation of the pump head computation in FlowDistribution"
   extends Modelica.Icons.Example;
@@ -6,7 +6,7 @@ model FlowDistributionPumpControl
     "Source side medium";
   package Medium2=Buildings.Media.Air
     "Load side medium";
-  parameter String filNam="modelica://Buildings/Resources/Data/Experimental/DHC/Loads/Examples/SwissResidential_20190916.mos"
+  parameter String filNam="modelica://Buildings/Resources/Data/DHC/Loads/Examples/SwissResidential_20190916.mos"
     "File name with thermal loads as time series";
   parameter Integer nLoa=5
     "Number of served loads"
@@ -41,11 +41,11 @@ model FlowDistributionPumpControl
   final parameter Modelica.Units.SI.PressureDifference dp_nominal=max(terUniHea.dpSou_nominal)
        + 2*nLoa*5000 "Nominal pressure drop in the distribution line";
   final parameter Modelica.Units.SI.HeatFlowRate QHea_flow_nominal=
-      Buildings.Experimental.DHC.Loads.BaseClasses.getPeakLoad(string="#Peak space heating load", filNam=
+      Buildings.DHC.Loads.BaseClasses.getPeakLoad(string="#Peak space heating load", filNam=
       Modelica.Utilities.Files.loadResource(filNam))/facMul
     "Design heating heat flow rate (>=0)"
     annotation (Dialog(group="Nominal condition"));
-  Buildings.Experimental.DHC.Loads.BaseClasses.Validation.BaseClasses.FanCoil2PipeHeatingValve terUniHea[nLoa](
+  Buildings.DHC.Loads.BaseClasses.Validation.BaseClasses.FanCoil2PipeHeatingValve terUniHea[nLoa](
     redeclare each final package Medium1=Medium1,
     redeclare each final package Medium2=Medium2,
     each final facMul=facMul,
@@ -83,7 +83,7 @@ model FlowDistributionPumpControl
     nout=nLoa)
     "Repeat input to output an array"
     annotation (Placement(transformation(extent={{-128,20},{-108,40}})));
-  Buildings.Experimental.DHC.Networks.Distribution2Pipe_R dis(
+  Buildings.DHC.Networks.Distribution2Pipe_R dis(
     redeclare final package Medium = Medium1,
     final nCon=nLoa,
     final allowFlowReversal=false,
@@ -116,11 +116,11 @@ model FlowDistributionPumpControl
     nPorts=3)
     "Heating water source"
     annotation (Placement(transformation(extent={{-10,-10},{10,10}},rotation=0,origin={-130,0})));
-  Buildings.Experimental.DHC.Loads.BaseClasses.FlowDistribution disCstDp(
+  Buildings.DHC.Loads.BaseClasses.FlowDistribution disCstDp(
     redeclare package Medium=Medium1,
     m_flow_nominal=m_flow_nominal,
     have_pum=true,
-    typCtr=Buildings.Experimental.DHC.Loads.BaseClasses.Types.PumpControlType.ConstantDp,
+    typCtr=Buildings.DHC.Loads.BaseClasses.Types.PumpControlType.ConstantDp,
     dp_nominal=dp_nominal,
     dpMin=dpSet,
     mUni_flow_nominal=mCon_flow_nominal,
@@ -134,7 +134,7 @@ model FlowDistributionPumpControl
     nPorts=3)
     "Sink for heating water"
     annotation (Placement(transformation(extent={{10,-10},{-10,10}},rotation=0,origin={150,0})));
-  Buildings.Experimental.DHC.Loads.BaseClasses.Validation.BaseClasses.FanCoil2PipeHeating terUniHea1[nLoa](
+  Buildings.DHC.Loads.BaseClasses.Validation.BaseClasses.FanCoil2PipeHeating terUniHea1[nLoa](
     redeclare each final package Medium1=Medium1,
     redeclare each final package Medium2=Medium2,
     each final facMul=facMul,
@@ -167,7 +167,7 @@ model FlowDistributionPumpControl
     k=1)
     "Constant one"
     annotation (Placement(transformation(extent={{-180,190},{-160,210}})));
-  Buildings.Experimental.DHC.Loads.BaseClasses.Validation.BaseClasses.FanCoil2PipeHeating terUniHea2[nLoa](
+  Buildings.DHC.Loads.BaseClasses.Validation.BaseClasses.FanCoil2PipeHeating terUniHea2[nLoa](
     redeclare each final package Medium1=Medium1,
     redeclare each final package Medium2=Medium2,
     each final facMul=facMul,
@@ -179,11 +179,11 @@ model FlowDistributionPumpControl
     each final have_speVar=false)
     "Heating terminal unit"
     annotation (Placement(transformation(extent={{-10,118},{10,138}})));
-  Buildings.Experimental.DHC.Loads.BaseClasses.FlowDistribution disCstSpe(
+  Buildings.DHC.Loads.BaseClasses.FlowDistribution disCstSpe(
     redeclare package Medium=Medium1,
     m_flow_nominal=m_flow_nominal,
     have_pum=true,
-    typCtr=Buildings.Experimental.DHC.Loads.BaseClasses.Types.PumpControlType.ConstantSpeed,
+    typCtr=Buildings.DHC.Loads.BaseClasses.Types.PumpControlType.ConstantSpeed,
     dp_nominal=dp_nominal,
     dpMin=dpSet,
     mUni_flow_nominal=mCon_flow_nominal,
@@ -299,8 +299,8 @@ equation
       info="<html>
 <p>
 This model validates the pump head computation algorithm implemented in
-<a href=\"modelica://Buildings.Experimental.DHC.Loads.BaseClasses.FlowDistribution\">
-Buildings.Experimental.DHC.Loads.BaseClasses.FlowDistribution</a>.
+<a href=\"modelica://Buildings.DHC.Loads.BaseClasses.FlowDistribution\">
+Buildings.DHC.Loads.BaseClasses.FlowDistribution</a>.
 </p>
 </html>",
       revisions="<html>
@@ -329,5 +329,5 @@ First implementation.
         preserveAspectRatio=false,
         extent={{-220,-240},{200,240}})),
     __Dymola_Commands(
-      file="modelica://Buildings/Resources/Scripts/Dymola/Experimental/DHC/Loads/BaseClasses/Validation/FlowDistributionPumpControl.mos" "Simulate and plot"));
+      file="modelica://Buildings/Resources/Scripts/Dymola/DHC/Loads/BaseClasses/Validation/FlowDistributionPumpControl.mos" "Simulate and plot"));
 end FlowDistributionPumpControl;
diff --git a/Buildings/Experimental/DHC/Loads/BaseClasses/Validation/GetPeakLoad.mo b/Buildings/DHC/Loads/BaseClasses/Validation/GetPeakLoad.mo
similarity index 67%
rename from Buildings/Experimental/DHC/Loads/BaseClasses/Validation/GetPeakLoad.mo
rename to Buildings/DHC/Loads/BaseClasses/Validation/GetPeakLoad.mo
index 40269fd67eb..9a8c1f0141a 100644
--- a/Buildings/Experimental/DHC/Loads/BaseClasses/Validation/GetPeakLoad.mo
+++ b/Buildings/DHC/Loads/BaseClasses/Validation/GetPeakLoad.mo
@@ -1,21 +1,21 @@
-within Buildings.Experimental.DHC.Loads.BaseClasses.Validation;
+within Buildings.DHC.Loads.BaseClasses.Validation;
 model GetPeakLoad
   "Model that validates the getPeakLoad function"
   extends Modelica.Icons.Example;
   parameter Modelica.Units.SI.HeatFlowRate QCoo_flow=
-      Buildings.Experimental.DHC.Loads.BaseClasses.getPeakLoad(string=
+      Buildings.DHC.Loads.BaseClasses.getPeakLoad(string=
       "#Peak space cooling load", filNam=Modelica.Utilities.Files.loadResource(
-      "modelica://Buildings/Resources/Data/Experimental/DHC/Loads/BaseClasses/Validation/RefBldgLargeOfficeNew2004_7.1_5.0_3C_USA_CA_SAN_FRANCISCO.mos"))
+      "modelica://Buildings/Resources/Data/DHC/Loads/BaseClasses/Validation/RefBldgLargeOfficeNew2004_7.1_5.0_3C_USA_CA_SAN_FRANCISCO.mos"))
     "Peak heat flow rate";
   parameter Modelica.Units.SI.HeatFlowRate QHea_flow=
-      Buildings.Experimental.DHC.Loads.BaseClasses.getPeakLoad(string=
+      Buildings.DHC.Loads.BaseClasses.getPeakLoad(string=
       "#Peak space heating load", filNam=Modelica.Utilities.Files.loadResource(
-      "modelica://Buildings/Resources/Data/Experimental/DHC/Loads/BaseClasses/Validation/RefBldgLargeOfficeNew2004_7.1_5.0_3C_USA_CA_SAN_FRANCISCO.mos"))
+      "modelica://Buildings/Resources/Data/DHC/Loads/BaseClasses/Validation/RefBldgLargeOfficeNew2004_7.1_5.0_3C_USA_CA_SAN_FRANCISCO.mos"))
     "Peak heat flow rate";
   parameter Modelica.Units.SI.HeatFlowRate QWatHea_flow=
-      Buildings.Experimental.DHC.Loads.BaseClasses.getPeakLoad(string=
+      Buildings.DHC.Loads.BaseClasses.getPeakLoad(string=
       "#Peak water heating load", filNam=Modelica.Utilities.Files.loadResource(
-      "modelica://Buildings/Resources/Data/Experimental/DHC/Loads/BaseClasses/Validation/RefBldgLargeOfficeNew2004_7.1_5.0_3C_USA_CA_SAN_FRANCISCO.mos"))
+      "modelica://Buildings/Resources/Data/DHC/Loads/BaseClasses/Validation/RefBldgLargeOfficeNew2004_7.1_5.0_3C_USA_CA_SAN_FRANCISCO.mos"))
     "Peak water heating flow rate";
 equation
   assert(
@@ -38,7 +38,7 @@ equation
       Tolerance=1e-6,
       StopTime=1.0),
     __Dymola_Commands(
-      file="modelica://Buildings/Resources/Scripts/Dymola/Experimental/DHC/Loads/BaseClasses/Validation/GetPeakLoad.mos" "Simulate and plot"),
+      file="modelica://Buildings/Resources/Scripts/Dymola/DHC/Loads/BaseClasses/Validation/GetPeakLoad.mos" "Simulate and plot"),
     Documentation(
       info="<html>
 <p>
diff --git a/Buildings/Experimental/DHC/Loads/BaseClasses/Validation/SimpleRoomODE.mo b/Buildings/DHC/Loads/BaseClasses/Validation/SimpleRoomODE.mo
similarity index 90%
rename from Buildings/Experimental/DHC/Loads/BaseClasses/Validation/SimpleRoomODE.mo
rename to Buildings/DHC/Loads/BaseClasses/Validation/SimpleRoomODE.mo
index 15ac5044319..65795128f41 100644
--- a/Buildings/Experimental/DHC/Loads/BaseClasses/Validation/SimpleRoomODE.mo
+++ b/Buildings/DHC/Loads/BaseClasses/Validation/SimpleRoomODE.mo
@@ -1,4 +1,4 @@
-within Buildings.Experimental.DHC.Loads.BaseClasses.Validation;
+within Buildings.DHC.Loads.BaseClasses.Validation;
 model SimpleRoomODE
   "Validation of the model SimpleRoomODE"
   extends Modelica.Icons.Example;
@@ -14,7 +14,7 @@ model SimpleRoomODE
     annotation (Dialog(group="Nominal condition"));
   parameter Modelica.Units.SI.Time tau=1800
     "Time constant of the indoor temperature";
-  Buildings.Experimental.DHC.Loads.BaseClasses.Examples.BaseClasses.GeojsonExportRC.OfficeBuilding.Office romHeaMet
+  Buildings.DHC.Loads.BaseClasses.Examples.BaseClasses.GeojsonExportRC.OfficeBuilding.Office romHeaMet
     "ROM where the heating load is always met"
     annotation (Placement(transformation(extent={{-10,90},{10,110}})));
   BoundaryConditions.WeatherData.ReaderTMY3 weaDat(
@@ -42,7 +42,7 @@ model SimpleRoomODE
   HeatTransfer.Sources.PrescribedHeatFlow prescribedHeatFlow
     "Prescribed heat flow rate"
     annotation (Placement(transformation(extent={{82,130},{62,150}})));
-  Buildings.Experimental.DHC.Loads.BaseClasses.Examples.BaseClasses.GeojsonExportRC.OfficeBuilding.Office romHeaUnm
+  Buildings.DHC.Loads.BaseClasses.Examples.BaseClasses.GeojsonExportRC.OfficeBuilding.Office romHeaUnm
     "ROM where the heating load is not met"
     annotation (Placement(transformation(extent={{-10,50},{10,70}})));
   Buildings.Controls.OBC.CDL.Reals.MultiplyByParameter gai1(k=0.7)
@@ -51,7 +51,7 @@ model SimpleRoomODE
   HeatTransfer.Sources.PrescribedHeatFlow prescribedHeatFlow1
     "Prescribed heat flow rate"
     annotation (Placement(transformation(extent={{82,70},{62,90}})));
-  Buildings.Experimental.DHC.Loads.BaseClasses.SimpleRoomODE rooOdeHea(
+  Buildings.DHC.Loads.BaseClasses.SimpleRoomODE rooOdeHea(
     dTEnv_nominal=20,
     TAir_start=293.15,
     QEnv_flow_nominal=QHea_flow_nominal,
@@ -73,7 +73,7 @@ model SimpleRoomODE
   Buildings.Controls.OBC.CDL.Reals.MultiplyByParameter gai2(k=
         QCoo_flow_nominal) "Scaling"
     annotation (Placement(transformation(extent={{60,-110},{80,-90}})));
-  Buildings.Experimental.DHC.Loads.BaseClasses.SimpleRoomODE rooOdeCoo(
+  Buildings.DHC.Loads.BaseClasses.SimpleRoomODE rooOdeCoo(
     dTEnv_nominal=20,
     TAir_start=293.15,
     QEnv_flow_nominal=QHea_flow_nominal,
@@ -92,10 +92,10 @@ model SimpleRoomODE
       "modelica://Buildings/Resources/weatherdata/USA_CA_San.Francisco.Intl.AP.724940_TMY3.mos"))
     "Weather data reader"
     annotation (Placement(transformation(extent={{-140,-110},{-120,-90}})));
-  Buildings.Experimental.DHC.Loads.BaseClasses.Examples.BaseClasses.GeojsonExportRC.OfficeBuilding.Office romCooMet
+  Buildings.DHC.Loads.BaseClasses.Examples.BaseClasses.GeojsonExportRC.OfficeBuilding.Office romCooMet
     "ROM where the cooling load is always met"
     annotation (Placement(transformation(extent={{-10,-130},{10,-110}})));
-  Buildings.Experimental.DHC.Loads.BaseClasses.Examples.BaseClasses.GeojsonExportRC.OfficeBuilding.Office romCooUnm
+  Buildings.DHC.Loads.BaseClasses.Examples.BaseClasses.GeojsonExportRC.OfficeBuilding.Office romCooUnm
     "ROM where the cooling load is not met"
     annotation (Placement(transformation(extent={{-10,-90},{10,-70}})));
   HeatTransfer.Sources.PrescribedHeatFlow prescribedHeatFlow2
@@ -166,8 +166,8 @@ equation
 <html>
 <p>
 This example validates
-<a href=\"modelica://Buildings.Experimental.DHC.Loads.BaseClasses.SimpleRoomODE\">
-Buildings.Experimental.DHC.Loads.BaseClasses.SimpleRoomODE</a> by comparison with
+<a href=\"modelica://Buildings.DHC.Loads.BaseClasses.SimpleRoomODE\">
+Buildings.DHC.Loads.BaseClasses.SimpleRoomODE</a> by comparison with
 <a href=\"modelica://Buildings.ThermalZones.ReducedOrder.RC.TwoElements\">
 Buildings.ThermalZones.ReducedOrder.RC.TwoElements</a>.
 <p>
@@ -194,7 +194,7 @@ First implementation.
 </ul>
 </html>"),
     __Dymola_Commands(
-      file="modelica://Buildings/Resources/Scripts/Dymola/Experimental/DHC/Loads/BaseClasses/Validation/SimpleRoomODE.mos" "Simulate and plot"),
+      file="modelica://Buildings/Resources/Scripts/Dymola/DHC/Loads/BaseClasses/Validation/SimpleRoomODE.mos" "Simulate and plot"),
     Diagram(
       coordinateSystem(
         extent={{-180,-200},{180,200}})));
diff --git a/Buildings/Experimental/DHC/Loads/BaseClasses/Validation/TerminalUnitScaling.mo b/Buildings/DHC/Loads/BaseClasses/Validation/TerminalUnitScaling.mo
similarity index 92%
rename from Buildings/Experimental/DHC/Loads/BaseClasses/Validation/TerminalUnitScaling.mo
rename to Buildings/DHC/Loads/BaseClasses/Validation/TerminalUnitScaling.mo
index d12c1ee69ea..6c4d606d873 100644
--- a/Buildings/Experimental/DHC/Loads/BaseClasses/Validation/TerminalUnitScaling.mo
+++ b/Buildings/DHC/Loads/BaseClasses/Validation/TerminalUnitScaling.mo
@@ -1,4 +1,4 @@
-within Buildings.Experimental.DHC.Loads.BaseClasses.Validation;
+within Buildings.DHC.Loads.BaseClasses.Validation;
 model TerminalUnitScaling
   "Validation of the scaling factor of the terminal unit model"
   extends Modelica.Icons.Example;
@@ -58,7 +58,7 @@ model TerminalUnitScaling
     nPorts=3)
     "Sink for heating water"
     annotation (Placement(transformation(extent={{10,-10},{-10,10}},rotation=0,origin={90,0})));
-  Buildings.Experimental.DHC.Loads.BaseClasses.Validation.BaseClasses.FanCoil2PipeHeating ter(
+  Buildings.DHC.Loads.BaseClasses.Validation.BaseClasses.FanCoil2PipeHeating ter(
     have_speVar=false,
     redeclare package Medium1 = Medium1,
     redeclare package Medium2 = Medium2,
@@ -72,7 +72,7 @@ model TerminalUnitScaling
   Buildings.Controls.OBC.CDL.Reals.Sources.Constant TSet(k=293.15, y(
         final unit="K", displayUnit="degC")) "Temperature set point"
     annotation (Placement(transformation(extent={{-100,50},{-80,70}})));
- Buildings.Experimental.DHC.Loads.BaseClasses.Validation.BaseClasses.FanCoil2PipeHeating terUniMul(
+ Buildings.DHC.Loads.BaseClasses.Validation.BaseClasses.FanCoil2PipeHeating terUniMul(
     have_speVar=false,
     redeclare package Medium1=Medium1,
     redeclare package Medium2=Medium2,
@@ -97,7 +97,7 @@ model TerminalUnitScaling
     duration=500)
     "Required heat flow rate"
     annotation (Placement(transformation(extent={{-100,10},{-80,30}})));
- Buildings.Experimental.DHC.Loads.BaseClasses.Validation.BaseClasses.FanCoil2PipeHeating terUniMulZonMul(
+ Buildings.DHC.Loads.BaseClasses.Validation.BaseClasses.FanCoil2PipeHeating terUniMulZonMul(
     facMulZon=facMul,
     have_speVar=false,
     redeclare package Medium1 = Medium1,
@@ -162,8 +162,8 @@ equation
 <p>
 This example validates the use of the unit multiplier and zone multiplier factors
 for models of terminal units inheriting from
-<a href=\"modelica://Buildings.Experimental.DHC.Loads.BaseClasses.PartialTerminalUnit\">
-Buildings.Experimental.DHC.Loads.BaseClasses.PartialTerminalUnit</a>.
+<a href=\"modelica://Buildings.DHC.Loads.BaseClasses.PartialTerminalUnit\">
+Buildings.DHC.Loads.BaseClasses.PartialTerminalUnit</a>.
 </p>
 </html>",
       revisions="<html>
@@ -179,5 +179,5 @@ First implementation.
         preserveAspectRatio=false,
         extent={{-120,-120},{120,120}})),
     __Dymola_Commands(
-      file="modelica://Buildings/Resources/Scripts/Dymola/Experimental/DHC/Loads/BaseClasses/Validation/TerminalUnitScaling.mos" "Simulate and plot"));
+      file="modelica://Buildings/Resources/Scripts/Dymola/DHC/Loads/BaseClasses/Validation/TerminalUnitScaling.mos" "Simulate and plot"));
 end TerminalUnitScaling;
diff --git a/Buildings/Experimental/DHC/Loads/BaseClasses/Validation/package.mo b/Buildings/DHC/Loads/BaseClasses/Validation/package.mo
similarity index 61%
rename from Buildings/Experimental/DHC/Loads/BaseClasses/Validation/package.mo
rename to Buildings/DHC/Loads/BaseClasses/Validation/package.mo
index 9e2142e98e9..b227b690ca1 100644
--- a/Buildings/Experimental/DHC/Loads/BaseClasses/Validation/package.mo
+++ b/Buildings/DHC/Loads/BaseClasses/Validation/package.mo
@@ -1,4 +1,4 @@
-within Buildings.Experimental.DHC.Loads.BaseClasses;
+within Buildings.DHC.Loads.BaseClasses;
 package Validation "Collection of validation models"
   extends Modelica.Icons.ExamplesPackage;
 
@@ -8,8 +8,8 @@ package Validation "Collection of validation models"
       info="<html>
 <p>
 This package contains models that validate the base classes in
-<a href=\"modelica://Buildings.Experimental.DHC.Loads.BaseClasses\">
-Buildings.Experimental.DHC.Loads.BaseClasses</a>.
+<a href=\"modelica://Buildings.DHC.Loads.BaseClasses\">
+Buildings.DHC.Loads.BaseClasses</a>.
 </p>
 </html>"));
 end Validation;
diff --git a/Buildings/Experimental/DHC/Loads/BaseClasses/Validation/package.order b/Buildings/DHC/Loads/BaseClasses/Validation/package.order
similarity index 100%
rename from Buildings/Experimental/DHC/Loads/BaseClasses/Validation/package.order
rename to Buildings/DHC/Loads/BaseClasses/Validation/package.order
diff --git a/Buildings/Experimental/DHC/Loads/BaseClasses/getPeakLoad.mo b/Buildings/DHC/Loads/BaseClasses/getPeakLoad.mo
similarity index 95%
rename from Buildings/Experimental/DHC/Loads/BaseClasses/getPeakLoad.mo
rename to Buildings/DHC/Loads/BaseClasses/getPeakLoad.mo
index 3cdca0680b1..6238a4d4b92 100644
--- a/Buildings/Experimental/DHC/Loads/BaseClasses/getPeakLoad.mo
+++ b/Buildings/DHC/Loads/BaseClasses/getPeakLoad.mo
@@ -1,4 +1,4 @@
-within Buildings.Experimental.DHC.Loads.BaseClasses;
+within Buildings.DHC.Loads.BaseClasses;
 pure function getPeakLoad
   "Function that reads the peak load from the load profile"
   extends Modelica.Icons.Function;
@@ -128,8 +128,8 @@ terminates the simulation with an assertion.
 </p>
 <p>
 See
-<a href=\"modelica://Buildings.Experimental.DHC.Loads.BaseClasses.Validation.GetPeakLoad\">
-Buildings.Experimental.DHC.Loads.BaseClasses.Validation.GetPeakLoad</a>
+<a href=\"modelica://Buildings.DHC.Loads.BaseClasses.Validation.GetPeakLoad\">
+Buildings.DHC.Loads.BaseClasses.Validation.GetPeakLoad</a>
 for how to invoke this function.
 </p>
 </html>",
diff --git a/Buildings/Experimental/DHC/Plants/BaseClasses/package.mo b/Buildings/DHC/Loads/BaseClasses/package.mo
similarity index 66%
rename from Buildings/Experimental/DHC/Plants/BaseClasses/package.mo
rename to Buildings/DHC/Loads/BaseClasses/package.mo
index d033e3782b3..58d6109de89 100644
--- a/Buildings/Experimental/DHC/Plants/BaseClasses/package.mo
+++ b/Buildings/DHC/Loads/BaseClasses/package.mo
@@ -1,4 +1,4 @@
-within Buildings.Experimental.DHC.Plants;
+within Buildings.DHC.Loads;
 package BaseClasses "Package with base classes"
   extends Modelica.Icons.BasesPackage;
 
@@ -8,8 +8,8 @@ package BaseClasses "Package with base classes"
       info="<html>
 <p>
 This package contains base classes that are used to construct the classes in
-<a href=\"modelica://Buildings.Experimental.DHC.Plants\">
-Buildings.Experimental.DHC.Plants</a>.
+<a href=\"modelica://Buildings.DHC.Loads\">
+Buildings.DHC.Loads</a>.
 </p>
 </html>"));
 end BaseClasses;
diff --git a/Buildings/Experimental/DHC/Loads/BaseClasses/package.order b/Buildings/DHC/Loads/BaseClasses/package.order
similarity index 54%
rename from Buildings/Experimental/DHC/Loads/BaseClasses/package.order
rename to Buildings/DHC/Loads/BaseClasses/package.order
index 52d611fc112..66056ef97e3 100644
--- a/Buildings/Experimental/DHC/Loads/BaseClasses/package.order
+++ b/Buildings/DHC/Loads/BaseClasses/package.order
@@ -1,7 +1,15 @@
+BuildingRCZ1Valve
+BuildingRCZ6
+BuildingSpawnZ1
+BuildingSpawnZ6
+BuildingTimeSeries
 ConstraintViolation
+FanCoil4Pipe
+FanCoil4PipeHeatPorts
 FlowDistribution
 PartialBuilding
 PartialBuildingWithPartialETS
+PartialFanCoil4Pipe
 PartialTerminalUnit
 SimpleRoomODE
 getPeakLoad
diff --git a/Buildings/Experimental/DHC/Loads/Combined/BaseClasses/PartialBuildingWithETS.mo b/Buildings/DHC/Loads/Combined/BaseClasses/PartialBuildingWithETS.mo
similarity index 93%
rename from Buildings/Experimental/DHC/Loads/Combined/BaseClasses/PartialBuildingWithETS.mo
rename to Buildings/DHC/Loads/Combined/BaseClasses/PartialBuildingWithETS.mo
index 8ee749b21c7..e5f1d9088cd 100644
--- a/Buildings/Experimental/DHC/Loads/Combined/BaseClasses/PartialBuildingWithETS.mo
+++ b/Buildings/DHC/Loads/Combined/BaseClasses/PartialBuildingWithETS.mo
@@ -1,8 +1,8 @@
-within Buildings.Experimental.DHC.Loads.Combined.BaseClasses;
+within Buildings.DHC.Loads.Combined.BaseClasses;
 model PartialBuildingWithETS
   "Partial model with ETS model and partial building model"
   extends
-    Buildings.Experimental.DHC.Loads.BaseClasses.PartialBuildingWithPartialETS(
+    Buildings.DHC.Loads.BaseClasses.PartialBuildingWithPartialETS(
     nPorts_heaWat=1,
     nPorts_chiWat=1);
   parameter Modelica.Units.SI.Temperature TDisWatMin=6 + 273.15
@@ -24,7 +24,7 @@ model PartialBuildingWithETS
   parameter Modelica.Units.SI.Temperature TColWat_nominal=288.15
     "Cold water temperature (for hot water production)"
     annotation (Dialog(group="ETS model parameters", enable=have_hotWat));
-  parameter Modelica.Units.SI.Pressure dp_nominal=50000
+  parameter Modelica.Units.SI.Pressure dp_nominal(displayUnit="Pa")=50000
     "Pressure difference at nominal flow rate (for each flow leg)"
     annotation (Dialog(group="ETS model parameters"));
   parameter Real COPHeaWat_nominal(final unit="1") = 4.0
@@ -113,8 +113,8 @@ equation
     Documentation(info="<html>
 <p>
 This model is composed of a heat pump based energy transfer station model
-<a href=\"modelica://Buildings.Experimental.DHC.EnergyTransferStations.Combined.HeatPumpHeatExchanger\">
-Buildings.Experimental.DHC.EnergyTransferStations.Combined.HeatPumpHeatExchanger</a>
+<a href=\"modelica://Buildings.DHC.ETS.Combined.HeatPumpHeatExchanger\">
+Buildings.DHC.ETS.Combined.HeatPumpHeatExchanger</a>
 connected to a repleacable building load model.
 </p>
 </html>", revisions="<html>
diff --git a/Buildings/Experimental/DHC/Loads/Cooling/BaseClasses/package.mo b/Buildings/DHC/Loads/Combined/BaseClasses/package.mo
similarity index 63%
rename from Buildings/Experimental/DHC/Loads/Cooling/BaseClasses/package.mo
rename to Buildings/DHC/Loads/Combined/BaseClasses/package.mo
index 62d02f9095a..d4501e9150d 100644
--- a/Buildings/Experimental/DHC/Loads/Cooling/BaseClasses/package.mo
+++ b/Buildings/DHC/Loads/Combined/BaseClasses/package.mo
@@ -1,12 +1,12 @@
-within Buildings.Experimental.DHC.Loads.Cooling;
+within Buildings.DHC.Loads.Combined;
 package BaseClasses "Package with base classes that are used by multiple models"
   extends Modelica.Icons.BasesPackage;
 
 annotation (Documentation(info="<html>
 <p>
 This package contains base classes that are used to construct the classes in
-<a href=\"modelica://Buildings.Experimental.DHC.Loads.Cooling\">
-Buildings.Experimental.DHC.Loads.Cooling</a>.
+<a href=\"modelica://Buildings.DHC.Loads.Combined\">
+Buildings.DHC.Loads.Combined</a>.
 </p>
 </html>"));
 end BaseClasses;
diff --git a/Buildings/Experimental/DHC/Loads/Combined/BaseClasses/package.order b/Buildings/DHC/Loads/Combined/BaseClasses/package.order
similarity index 100%
rename from Buildings/Experimental/DHC/Loads/Combined/BaseClasses/package.order
rename to Buildings/DHC/Loads/Combined/BaseClasses/package.order
diff --git a/Buildings/Experimental/DHC/Loads/Combined/BuildingTimeSeriesWithETS.mo b/Buildings/DHC/Loads/Combined/BuildingTimeSeriesWithETS.mo
similarity index 91%
rename from Buildings/Experimental/DHC/Loads/Combined/BuildingTimeSeriesWithETS.mo
rename to Buildings/DHC/Loads/Combined/BuildingTimeSeriesWithETS.mo
index bb9b3ddbd72..54fd321b5e7 100644
--- a/Buildings/Experimental/DHC/Loads/Combined/BuildingTimeSeriesWithETS.mo
+++ b/Buildings/DHC/Loads/Combined/BuildingTimeSeriesWithETS.mo
@@ -1,9 +1,9 @@
-within Buildings.Experimental.DHC.Loads.Combined;
+within Buildings.DHC.Loads.Combined;
 model BuildingTimeSeriesWithETS
   "Model of a building with loads provided as time series, connected to an ETS"
   extends
-    Buildings.Experimental.DHC.Loads.Combined.BaseClasses.PartialBuildingWithETS(
-    redeclare Buildings.Experimental.DHC.Loads.BaseClasses.Examples.BaseClasses.BuildingTimeSeries bui(
+    Buildings.DHC.Loads.Combined.BaseClasses.PartialBuildingWithETS(
+    redeclare Buildings.DHC.Loads.BaseClasses.BuildingTimeSeries bui(
       filNam=filNam,
       have_hotWat=true,
       T_aHeaWat_nominal=ets.THeaWatSup_nominal,
@@ -11,7 +11,7 @@ model BuildingTimeSeriesWithETS
       T_aChiWat_nominal=ets.TChiWatSup_nominal,
       T_bChiWat_nominal=ets.TChiWatRet_nominal),
     redeclare
-      Buildings.Experimental.DHC.EnergyTransferStations.Combined.HeatPumpHeatExchanger
+      Buildings.DHC.ETS.Combined.HeatPumpHeatExchanger
       ets(
       final dT_nominal=dT_nominal,
       final TDisWatMin=TDisWatMin,
@@ -41,7 +41,7 @@ model BuildingTimeSeriesWithETS
     annotation (Dialog(group="Design parameter"));
   final parameter Modelica.Units.SI.HeatFlowRate QHot_flow_nominal(
     min=Modelica.Constants.eps)=
-    bui.facMul * Buildings.Experimental.DHC.Loads.BaseClasses.getPeakLoad(
+    bui.facMul * Buildings.DHC.Loads.BaseClasses.getPeakLoad(
       string="#Peak water heating load",
       filNam=Modelica.Utilities.Files.loadResource(filNam))
     "Hot water design load (>=0)"
@@ -109,8 +109,8 @@ equation
     Documentation(info="<html>
 <p>
 This model is composed of a heat pump based energy transfer station model
-<a href=\"modelica://Buildings.Experimental.DHC.EnergyTransferStations.Combined.HeatPumpHeatExchanger\">
-Buildings.Experimental.DHC.EnergyTransferStations.Combined.HeatPumpHeatExchanger</a>
+<a href=\"modelica://Buildings.DHC.ETS.Combined.HeatPumpHeatExchanger\">
+Buildings.DHC.ETS.Combined.HeatPumpHeatExchanger</a>
 connected to a simplified building model where the space heating, cooling
 and hot water loads are provided as time series.
 </p>
diff --git a/Buildings/Experimental/DHC/Loads/Combined/BuildingTimeSeriesWithETSWithDHWTank.mo b/Buildings/DHC/Loads/Combined/BuildingTimeSeriesWithETSWithDHWTank.mo
similarity index 88%
rename from Buildings/Experimental/DHC/Loads/Combined/BuildingTimeSeriesWithETSWithDHWTank.mo
rename to Buildings/DHC/Loads/Combined/BuildingTimeSeriesWithETSWithDHWTank.mo
index 83bc8ddd393..ee93ef1776d 100644
--- a/Buildings/Experimental/DHC/Loads/Combined/BuildingTimeSeriesWithETSWithDHWTank.mo
+++ b/Buildings/DHC/Loads/Combined/BuildingTimeSeriesWithETSWithDHWTank.mo
@@ -1,9 +1,9 @@
-within Buildings.Experimental.DHC.Loads.Combined;
+within Buildings.DHC.Loads.Combined;
 model BuildingTimeSeriesWithETSWithDHWTank
   "Model of a building with loads provided as time series, connected to an ETS with domestic hot water storage tank"
   extends
-    Buildings.Experimental.DHC.Loads.Combined.BaseClasses.PartialBuildingWithETS(
-    redeclare Buildings.Experimental.DHC.Loads.BaseClasses.Examples.BaseClasses.BuildingTimeSeries bui(
+    Buildings.DHC.Loads.Combined.BaseClasses.PartialBuildingWithETS(
+    redeclare Buildings.DHC.Loads.BaseClasses.BuildingTimeSeries bui(
       filNam=filNam,
       have_hotWat=true,
       T_aHeaWat_nominal=ets.THeaWatSup_nominal,
@@ -11,7 +11,7 @@ model BuildingTimeSeriesWithETSWithDHWTank
       T_aChiWat_nominal=ets.TChiWatSup_nominal,
       T_bChiWat_nominal=ets.TChiWatRet_nominal),
     redeclare
-      Buildings.Experimental.DHC.EnergyTransferStations.Combined.HeatPumpHeatExchangerDHWTank
+      Buildings.DHC.ETS.Combined.HeatPumpHeatExchangerDHWTank
       ets(
       final dT_nominal=dT_nominal,
       final TDisWatMin=TDisWatMin,
@@ -42,7 +42,7 @@ model BuildingTimeSeriesWithETSWithDHWTank
     annotation (Dialog(group="Design parameter"));
   final parameter Modelica.Units.SI.HeatFlowRate QHot_flow_nominal(
     min=Modelica.Constants.eps)=
-    bui.facMul * Buildings.Experimental.DHC.Loads.BaseClasses.getPeakLoad(
+    bui.facMul * Buildings.DHC.Loads.BaseClasses.getPeakLoad(
       string="#Peak water heating load",
       filNam=Modelica.Utilities.Files.loadResource(filNam))
     "Hot water design load (>=0)"
@@ -113,12 +113,12 @@ equation
     Documentation(info="<html>
 <p>
 This model is the same as
-<a href=\"modelica://Buildings.Experimental.DHC.Loads.Combined.BuildingTimeSeriesWithETS\">
-Buildings.Experimental.DHC.Loads.Combined.BuildingTimeSeriesWithETS</a>
+<a href=\"modelica://Buildings.DHC.Loads.Combined.BuildingTimeSeriesWithETS\">
+Buildings.DHC.Loads.Combined.BuildingTimeSeriesWithETS</a>
 except that it implements an ETS that uses a heat pump with hot water
 storage tank for production of domestic hot water.  That ETS model is
-<a href=\"modelica://Buildings.Experimental.DHC.EnergyTransferStations.Combined.HeatPumpHeatExchangerDHWTank\">
-Buildings.Experimental.DHC.EnergyTransferStations.Combined.HeatPumpHeatExchangerDHWTank</a>.
+<a href=\"modelica://Buildings.DHC.ETS.Combined.HeatPumpHeatExchangerDHWTank\">
+Buildings.DHC.ETS.Combined.HeatPumpHeatExchangerDHWTank</a>.
 </p>
 </html>", revisions="<html>
 <ul>
diff --git a/Buildings/Experimental/DHC/Loads/Combined/Examples/BuildingTimeSeriesWithETS.mo b/Buildings/DHC/Loads/Combined/Examples/BuildingTimeSeriesWithETS.mo
similarity index 89%
rename from Buildings/Experimental/DHC/Loads/Combined/Examples/BuildingTimeSeriesWithETS.mo
rename to Buildings/DHC/Loads/Combined/Examples/BuildingTimeSeriesWithETS.mo
index a517e520d9e..443275cfb16 100644
--- a/Buildings/Experimental/DHC/Loads/Combined/Examples/BuildingTimeSeriesWithETS.mo
+++ b/Buildings/DHC/Loads/Combined/Examples/BuildingTimeSeriesWithETS.mo
@@ -1,4 +1,4 @@
-within Buildings.Experimental.DHC.Loads.Combined.Examples;
+within Buildings.DHC.Loads.Combined.Examples;
 model BuildingTimeSeriesWithETS
   "Example model of a building in an ambient district network with loads provided as time series and heat pump heating, free cooling, and heat pump domestic hot water"
   extends Modelica.Icons.Example;
@@ -24,13 +24,13 @@ model BuildingTimeSeriesWithETS
       displayUnit="degC") = 288.15)
     "District supply temperature"
     annotation (Placement(transformation(extent={{-92,-16},{-72,4}})));
-  Buildings.Experimental.DHC.Loads.Combined.BuildingTimeSeriesWithETS bui(
+  Buildings.DHC.Loads.Combined.BuildingTimeSeriesWithETS bui(
     redeclare package MediumSer = Medium,
     redeclare package MediumBui = Medium,
     bui(facMul=10),
     allowFlowReversalSer=true,
     THotWatSup_nominal=322.15,
-    filNam="modelica://Buildings/Resources/Data/Experimental/DHC/Loads/Examples/SwissOffice_20190916.mos")
+    filNam="modelica://Buildings/Resources/Data/DHC/Loads/Examples/SwissOffice_20190916.mos")
     annotation (Placement(transformation(extent={{40,-20},{60,0}})));
   Buildings.Controls.OBC.CDL.Reals.Sources.Constant TColWat(k=bui.ets.TColWat_nominal)
     "Cold water temperature"
@@ -78,7 +78,7 @@ equation
         coordinateSystem(
         preserveAspectRatio=false)),
     __Dymola_Commands(
-      file="modelica://Buildings/Resources/Scripts/Dymola/Experimental/DHC/Loads/Combined/Examples/BuildingTimeSeriesWithETS.mos" "Simulate and plot"),
+      file="modelica://Buildings/Resources/Scripts/Dymola/DHC/Loads/Combined/Examples/BuildingTimeSeriesWithETS.mos" "Simulate and plot"),
     experiment(
       StopTime=864000,
       Tolerance=1e-06),
@@ -87,8 +87,8 @@ equation
 Example model of a building in an ambient district network with loads
 provided as time series and heat pump heating, free cooling,
 and heat pump domestic hot water.  It uses
-<a href=\"modelica://Buildings.Experimental.DHC.Loads.Combined.BuildingTimeSeriesWithETS\">
-Buildings.Experimental.DHC.Loads.Combined.BuildingTimeSeriesWithETS</a>
+<a href=\"modelica://Buildings.DHC.Loads.Combined.BuildingTimeSeriesWithETS\">
+Buildings.DHC.Loads.Combined.BuildingTimeSeriesWithETS</a>
 </p>
 </html>", revisions="<html>
 <ul>
diff --git a/Buildings/Experimental/DHC/Loads/Combined/Examples/BuildingTimeSeriesWithETSDHWTank.mo b/Buildings/DHC/Loads/Combined/Examples/BuildingTimeSeriesWithETSDHWTank.mo
similarity index 86%
rename from Buildings/Experimental/DHC/Loads/Combined/Examples/BuildingTimeSeriesWithETSDHWTank.mo
rename to Buildings/DHC/Loads/Combined/Examples/BuildingTimeSeriesWithETSDHWTank.mo
index b6f705b2c95..c1b38bd87a9 100644
--- a/Buildings/Experimental/DHC/Loads/Combined/Examples/BuildingTimeSeriesWithETSDHWTank.mo
+++ b/Buildings/DHC/Loads/Combined/Examples/BuildingTimeSeriesWithETSDHWTank.mo
@@ -1,4 +1,4 @@
-within Buildings.Experimental.DHC.Loads.Combined.Examples;
+within Buildings.DHC.Loads.Combined.Examples;
 model BuildingTimeSeriesWithETSDHWTank
     "Example model of a building in an ambient district network with loads provided as time series and heat pump heating, free cooling, and heat pump with storage tank domestic hot water"
   extends Modelica.Icons.Example;
@@ -24,14 +24,14 @@ model BuildingTimeSeriesWithETSDHWTank
       displayUnit="degC") = 288.15)
     "District supply temperature"
     annotation (Placement(transformation(extent={{-90,4},{-70,24}})));
-  Buildings.Experimental.DHC.Loads.Combined.BuildingTimeSeriesWithETSWithDHWTank bui(
+  Buildings.DHC.Loads.Combined.BuildingTimeSeriesWithETSWithDHWTank bui(
     redeclare package MediumSer = Medium,
     redeclare package MediumBui = Medium,
     bui(facMul=10),
     allowFlowReversalSer=true,
     THotWatSup_nominal=313.15,
     filNam=
-        "modelica://Buildings/Resources/Data/Experimental/DHC/Loads/Examples/SwissOffice_20190916.mos",
+        "modelica://Buildings/Resources/Data/DHC/Loads/Examples/SwissOffice_20190916.mos",
     datWatHea=datWatHea) "Building load with time series data"
     annotation (Placement(transformation(extent={{40,-20},{60,0}})));
 
@@ -50,7 +50,7 @@ model BuildingTimeSeriesWithETSDHWTank
  Buildings.Controls.OBC.CDL.Reals.Sources.Constant THeaWatSupMinSet(k=28 + 273.15)
     "Heating water supply temperature set point - Minimum value"
     annotation (Placement(transformation(extent={{-90,70},{-70,90}})));
-  parameter Buildings.Experimental.DHC.Loads.HotWater.Data.GenericDomesticHotWaterWithHeatExchanger datWatHea(VTan=0.3,
+  parameter Buildings.DHC.Loads.HotWater.Data.GenericDomesticHotWaterWithHeatExchanger datWatHea(VTan=0.3,
       mDom_flow_nominal=0.03,
     TDom_nominal=318.15)
     "Performance data"
@@ -85,7 +85,7 @@ equation
         coordinateSystem(
         preserveAspectRatio=false)),
     __Dymola_Commands(
-      file="modelica://Buildings/Resources/Scripts/Dymola/Experimental/DHC/Loads/Combined/Examples/BuildingTimeSeriesWithETSDHWTank.mos" "Simulate and plot"),
+      file="modelica://Buildings/Resources/Scripts/Dymola/DHC/Loads/Combined/Examples/BuildingTimeSeriesWithETSDHWTank.mos" "Simulate and plot"),
     experiment(
       StopTime=864000,
       Tolerance=1e-06),
@@ -94,8 +94,8 @@ equation
 Example model of a building in an ambient district network with loads
 provided as time series and heat pump heating, free cooling, and heat pump
 with storage tank domestic hot water
-<a href=\"modelica://Buildings.Experimental.DHC.Loads.Combined.BuildingTimeSeriesWithETSWithDHWTank\">
-Buildings.Experimental.DHC.Loads.Combined.BuildingTimeSeriesWithETSWithDHWTank</a>
+<a href=\"modelica://Buildings.DHC.Loads.Combined.BuildingTimeSeriesWithETSWithDHWTank\">
+Buildings.DHC.Loads.Combined.BuildingTimeSeriesWithETSWithDHWTank</a>
 </p>
 </html>", revisions="<html>
 <ul>
diff --git a/Buildings/Experimental/DHC/Networks/Examples/package.mo b/Buildings/DHC/Loads/Combined/Examples/package.mo
similarity index 62%
rename from Buildings/Experimental/DHC/Networks/Examples/package.mo
rename to Buildings/DHC/Loads/Combined/Examples/package.mo
index 8ee733599b0..136d1f825d9 100644
--- a/Buildings/Experimental/DHC/Networks/Examples/package.mo
+++ b/Buildings/DHC/Loads/Combined/Examples/package.mo
@@ -1,11 +1,11 @@
-within Buildings.Experimental.DHC.Networks;
+within Buildings.DHC.Loads.Combined;
 package Examples "This package contains example models"
   extends Modelica.Icons.ExamplesPackage;
   annotation (Documentation(info="<html>
 <p>
 This package contains an example illustrating the use of the model in
-<a href=\"modelica://Buildings.Experimental.DHC.Networks\">
-Buildings.Experimental.DHC.Networks</a>.
+<a href=\"modelica://Buildings.DHC.Loads.Combined\">
+Buildings.DHC.Loads.Combined</a>.
 </p>
 </html>"));
 end Examples;
diff --git a/Buildings/Experimental/DHC/Loads/Combined/Examples/package.order b/Buildings/DHC/Loads/Combined/Examples/package.order
similarity index 100%
rename from Buildings/Experimental/DHC/Loads/Combined/Examples/package.order
rename to Buildings/DHC/Loads/Combined/Examples/package.order
diff --git a/Buildings/Experimental/DHC/Loads/Combined/package.mo b/Buildings/DHC/Loads/Combined/package.mo
similarity index 86%
rename from Buildings/Experimental/DHC/Loads/Combined/package.mo
rename to Buildings/DHC/Loads/Combined/package.mo
index e689605a8f6..6d2a01ecde1 100644
--- a/Buildings/Experimental/DHC/Loads/Combined/package.mo
+++ b/Buildings/DHC/Loads/Combined/package.mo
@@ -1,4 +1,4 @@
-within Buildings.Experimental.DHC.Loads;
+within Buildings.DHC.Loads;
 package Combined "Package with models for loads"
   extends Modelica.Icons.VariantsPackage;
 
diff --git a/Buildings/Experimental/DHC/Loads/Combined/package.order b/Buildings/DHC/Loads/Combined/package.order
similarity index 100%
rename from Buildings/Experimental/DHC/Loads/Combined/package.order
rename to Buildings/DHC/Loads/Combined/package.order
diff --git a/Buildings/Experimental/DHC/Loads/Cooling/BaseClasses/PartialBuildingWithETS.mo b/Buildings/DHC/Loads/Cooling/BaseClasses/PartialBuildingWithETS.mo
similarity index 88%
rename from Buildings/Experimental/DHC/Loads/Cooling/BaseClasses/PartialBuildingWithETS.mo
rename to Buildings/DHC/Loads/Cooling/BaseClasses/PartialBuildingWithETS.mo
index f4280807a0a..8ef09e1d5a9 100644
--- a/Buildings/Experimental/DHC/Loads/Cooling/BaseClasses/PartialBuildingWithETS.mo
+++ b/Buildings/DHC/Loads/Cooling/BaseClasses/PartialBuildingWithETS.mo
@@ -1,10 +1,10 @@
-within Buildings.Experimental.DHC.Loads.Cooling.BaseClasses;
+within Buildings.DHC.Loads.Cooling.BaseClasses;
 model PartialBuildingWithETS
   "Partial model with ETS model for cooling and partial building model"
   extends
-    Buildings.Experimental.DHC.Loads.BaseClasses.PartialBuildingWithPartialETS(
+    Buildings.DHC.Loads.BaseClasses.PartialBuildingWithPartialETS(
       nPorts_chiWat=1,
-      redeclare Buildings.Experimental.DHC.EnergyTransferStations.Cooling.Direct ets(
+      redeclare Buildings.DHC.ETS.Cooling.Direct ets(
       final mBui_flow_nominal=mBui_flow_nominal,
       final controllerType=controllerType,
       final k=k,
@@ -62,8 +62,8 @@ equation
   annotation (Documentation(info="<html>
 <p>
 This model is composed of a direct controlled energy transfer station model for cooling
-<a href=\"modelica://Buildings.Experimental.DHC.EnergyTransferStations.Cooling.Direct\">
-Buildings.Experimental.DHC.EnergyTransferStations.Cooling.Direct</a>
+<a href=\"modelica://Buildings.DHC.ETS.Cooling.Direct\">
+Buildings.DHC.ETS.Cooling.Direct</a>
 connected to a repleacable building load model.
 </p>
 </html>", revisions="<html>
diff --git a/Buildings/Experimental/DHC/Loads/Combined/BaseClasses/package.mo b/Buildings/DHC/Loads/Cooling/BaseClasses/package.mo
similarity index 62%
rename from Buildings/Experimental/DHC/Loads/Combined/BaseClasses/package.mo
rename to Buildings/DHC/Loads/Cooling/BaseClasses/package.mo
index 376050eab35..e9f826cacd4 100644
--- a/Buildings/Experimental/DHC/Loads/Combined/BaseClasses/package.mo
+++ b/Buildings/DHC/Loads/Cooling/BaseClasses/package.mo
@@ -1,12 +1,12 @@
-within Buildings.Experimental.DHC.Loads.Combined;
+within Buildings.DHC.Loads.Cooling;
 package BaseClasses "Package with base classes that are used by multiple models"
   extends Modelica.Icons.BasesPackage;
 
 annotation (Documentation(info="<html>
 <p>
 This package contains base classes that are used to construct the classes in
-<a href=\"modelica://Buildings.Experimental.DHC.Loads.Combined\">
-Buildings.Experimental.DHC.Loads.Combined</a>.
+<a href=\"modelica://Buildings.DHC.Loads.Cooling\">
+Buildings.DHC.Loads.Cooling</a>.
 </p>
 </html>"));
 end BaseClasses;
diff --git a/Buildings/Experimental/DHC/Loads/Cooling/BaseClasses/package.order b/Buildings/DHC/Loads/Cooling/BaseClasses/package.order
similarity index 100%
rename from Buildings/Experimental/DHC/Loads/Cooling/BaseClasses/package.order
rename to Buildings/DHC/Loads/Cooling/BaseClasses/package.order
diff --git a/Buildings/Experimental/DHC/Loads/Cooling/BuildingTimeSeriesWithETS.mo b/Buildings/DHC/Loads/Cooling/BuildingTimeSeriesWithETS.mo
similarity index 86%
rename from Buildings/Experimental/DHC/Loads/Cooling/BuildingTimeSeriesWithETS.mo
rename to Buildings/DHC/Loads/Cooling/BuildingTimeSeriesWithETS.mo
index a3038f24253..ff012cc2532 100644
--- a/Buildings/Experimental/DHC/Loads/Cooling/BuildingTimeSeriesWithETS.mo
+++ b/Buildings/DHC/Loads/Cooling/BuildingTimeSeriesWithETS.mo
@@ -1,8 +1,8 @@
-within Buildings.Experimental.DHC.Loads.Cooling;
+within Buildings.DHC.Loads.Cooling;
 model BuildingTimeSeriesWithETS
   "Model of a building with loads provided as time series, connected to an ETS for cooling"
   extends BaseClasses.PartialBuildingWithETS(
-    redeclare Buildings.Experimental.DHC.Loads.BaseClasses.Examples.BaseClasses.BuildingTimeSeries bui(
+    redeclare Buildings.DHC.Loads.BaseClasses.BuildingTimeSeries bui(
       final have_heaWat=false,
       final have_chiWat=true,
       final have_hotWat=false,
@@ -46,10 +46,10 @@ protected
   Documentation(info="<html>
 <p>
 This model is composed of a direct controlled energy transfer station model for cooling
-<a href=\"modelica://Buildings/Experimental/DHC/EnergyTransferStations/Cooling/Direct.mo\">
-Buildings.Experimental.DHC.EnergyTransferStations.Cooling.Direct</a>
-connected to a simplified building model <a href=\"modelica://Buildings/Experimental/DHC/Loads/Cooling/BaseClasses/BuildingTimeSeries.mo\">
-Buildings.Experimental.DHC.Loads.Cooling.BaseClasses.BuildingTimeSeries</a>
+<a href=\"modelica://Buildings.DHC.ETS.Cooling.Direct\">
+Buildings.DHC.ETS.Cooling.Direct</a>
+connected to a simplified building model <a href=\"modelica://Buildings.DHC.Loads.BaseClasses.BuildingTimeSeries\">
+Buildings.DHC.Loads.BaseClasses.BuildingTimeSeries</a>
 where the space cooling loads are provided as time series.
 </p>
 </html>", revisions="<html>
diff --git a/Buildings/Experimental/DHC/Loads/Cooling/Examples/BuildingTimeSeriesWithETS.mo b/Buildings/DHC/Loads/Cooling/Examples/BuildingTimeSeriesWithETS.mo
similarity index 87%
rename from Buildings/Experimental/DHC/Loads/Cooling/Examples/BuildingTimeSeriesWithETS.mo
rename to Buildings/DHC/Loads/Cooling/Examples/BuildingTimeSeriesWithETS.mo
index eef7c037788..626f03ad82b 100644
--- a/Buildings/Experimental/DHC/Loads/Cooling/Examples/BuildingTimeSeriesWithETS.mo
+++ b/Buildings/DHC/Loads/Cooling/Examples/BuildingTimeSeriesWithETS.mo
@@ -1,13 +1,13 @@
-within Buildings.Experimental.DHC.Loads.Cooling.Examples;
+within Buildings.DHC.Loads.Cooling.Examples;
 model BuildingTimeSeriesWithETS
   "Example model of a building with loads provided as time series and
   connected to an ETS for cooling"
   extends Modelica.Icons.Example;
   package Medium=Buildings.Media.Water
     "Medium model";
-  Buildings.Experimental.DHC.Loads.Cooling.BuildingTimeSeriesWithETS buiWitETS(
+  Buildings.DHC.Loads.Cooling.BuildingTimeSeriesWithETS buiWitETS(
     filNam=
-      "modelica://Buildings/Resources/Data/Experimental/DHC/Loads/Examples/MediumOffice-90.1-2010-5A.mos")
+      "modelica://Buildings/Resources/Data/DHC/Loads/Examples/MediumOffice-90.1-2010-5A.mos")
   "Building Time Series load coupled with ETS"
     annotation (Placement(transformation(extent={{40,-20},{60,0}})));
   Buildings.Fluid.Sources.Boundary_pT supChiWat(
@@ -54,7 +54,7 @@ equation
         coordinateSystem(
         preserveAspectRatio=false)),
     __Dymola_Commands(
-      file="modelica://Buildings/Resources/Scripts/Dymola/Experimental/DHC/Loads/Cooling/Examples/BuildingTimeSeriesWithETS.mos" "Simulate and plot"),
+      file="modelica://Buildings/Resources/Scripts/Dymola/DHC/Loads/Cooling/Examples/BuildingTimeSeriesWithETS.mos" "Simulate and plot"),
     experiment(
       StartTime=2592000,
       StopTime=3628800,
diff --git a/Buildings/Experimental/DHC/Loads/Cooling/Examples/package.mo b/Buildings/DHC/Loads/Cooling/Examples/package.mo
similarity index 55%
rename from Buildings/Experimental/DHC/Loads/Cooling/Examples/package.mo
rename to Buildings/DHC/Loads/Cooling/Examples/package.mo
index 5a620a2c59c..2a7c239728c 100644
--- a/Buildings/Experimental/DHC/Loads/Cooling/Examples/package.mo
+++ b/Buildings/DHC/Loads/Cooling/Examples/package.mo
@@ -1,11 +1,11 @@
-within Buildings.Experimental.DHC.Loads.Cooling;
+within Buildings.DHC.Loads.Cooling;
 package Examples
   extends Modelica.Icons.ExamplesPackage;
 
 annotation (Documentation(info="<html>
 <p>This package contains an example illustrating the use of the model in
-<a href=\"modelica://Buildings.Experimental.DHC.Loads.Cooling\">
-Buildings.Experimental.DHC.Loads.Cooling</a>.
+<a href=\"modelica://Buildings.DHC.Loads.Cooling\">
+Buildings.DHC.Loads.Cooling</a>.
 </p>
 </html>"));
 end Examples;
diff --git a/Buildings/Experimental/DHC/Loads/Cooling/Examples/package.order b/Buildings/DHC/Loads/Cooling/Examples/package.order
similarity index 100%
rename from Buildings/Experimental/DHC/Loads/Cooling/Examples/package.order
rename to Buildings/DHC/Loads/Cooling/Examples/package.order
diff --git a/Buildings/Experimental/DHC/Loads/Cooling/package.mo b/Buildings/DHC/Loads/Cooling/package.mo
similarity index 89%
rename from Buildings/Experimental/DHC/Loads/Cooling/package.mo
rename to Buildings/DHC/Loads/Cooling/package.mo
index ebd2e58e7cd..2a4deb6eb1c 100644
--- a/Buildings/Experimental/DHC/Loads/Cooling/package.mo
+++ b/Buildings/DHC/Loads/Cooling/package.mo
@@ -1,4 +1,4 @@
-within Buildings.Experimental.DHC.Loads;
+within Buildings.DHC.Loads;
 package Cooling "This package contains models for energy transfer stations used in district cooling system."
   extends Modelica.Icons.VariantsPackage;
 
diff --git a/Buildings/Experimental/DHC/Loads/Cooling/package.order b/Buildings/DHC/Loads/Cooling/package.order
similarity index 100%
rename from Buildings/Experimental/DHC/Loads/Cooling/package.order
rename to Buildings/DHC/Loads/Cooling/package.order
diff --git a/Buildings/Experimental/DHC/Loads/Heating/BaseClasses/PartialBuildingWithETS.mo b/Buildings/DHC/Loads/Heating/BaseClasses/PartialBuildingWithETS.mo
similarity index 88%
rename from Buildings/Experimental/DHC/Loads/Heating/BaseClasses/PartialBuildingWithETS.mo
rename to Buildings/DHC/Loads/Heating/BaseClasses/PartialBuildingWithETS.mo
index 61834ec600c..3ba01fb64cf 100644
--- a/Buildings/Experimental/DHC/Loads/Heating/BaseClasses/PartialBuildingWithETS.mo
+++ b/Buildings/DHC/Loads/Heating/BaseClasses/PartialBuildingWithETS.mo
@@ -1,10 +1,10 @@
-within Buildings.Experimental.DHC.Loads.Heating.BaseClasses;
+within Buildings.DHC.Loads.Heating.BaseClasses;
 model PartialBuildingWithETS
   "Partial model with ETS model for heating and partial building model"
   extends
-    Buildings.Experimental.DHC.Loads.BaseClasses.PartialBuildingWithPartialETS(
+    Buildings.DHC.Loads.BaseClasses.PartialBuildingWithPartialETS(
       nPorts_heaWat=1,
-      redeclare Buildings.Experimental.DHC.EnergyTransferStations.Heating.Direct ets(
+      redeclare Buildings.DHC.ETS.Heating.Direct ets(
       final mBui_flow_nominal=mBui_flow_nominal,
       final controllerType=controllerType,
       final k=k,
@@ -62,8 +62,8 @@ equation
   annotation (Documentation(info="<html>
 <p>
 This model is composed of a direct controlled energy transfer station model for cooling
-<a href=\"modelica://Buildings.Experimental.DHC.EnergyTransferStations.Cooling.Direct\">
-Buildings.Experimental.DHC.EnergyTransferStations.Cooling.Direct</a>
+<a href=\"modelica://Buildings.DHC.ETS.Cooling.Direct\">
+Buildings.DHC.ETS.Cooling.Direct</a>
 connected to a repleacable building load model.
 </p>
 </html>", revisions="<html>
diff --git a/Buildings/Experimental/DHC/Loads/HotWater/BaseClasses/package.mo b/Buildings/DHC/Loads/Heating/BaseClasses/package.mo
similarity index 62%
rename from Buildings/Experimental/DHC/Loads/HotWater/BaseClasses/package.mo
rename to Buildings/DHC/Loads/Heating/BaseClasses/package.mo
index 61962d052f2..886e2acd58b 100644
--- a/Buildings/Experimental/DHC/Loads/HotWater/BaseClasses/package.mo
+++ b/Buildings/DHC/Loads/Heating/BaseClasses/package.mo
@@ -1,12 +1,12 @@
-within Buildings.Experimental.DHC.Loads.HotWater;
+within Buildings.DHC.Loads.Heating;
 package BaseClasses "Package with base classes that are used by multiple models"
   extends Modelica.Icons.BasesPackage;
 
 annotation (Documentation(info="<html>
 <p>
 This package contains base classes that are used to construct the classes in
-<a href=\"modelica://Buildings.Experimental.DHC.Loads.HotWater\">
-Buildings.Experimental.DHC.Loads.Heating.DHW</a>.
+<a href=\"modelica://Buildings.DHC.Loads.Cooling\">
+Buildings.DHC.Loads.Cooling</a>.
 </p>
 </html>"));
 end BaseClasses;
diff --git a/Buildings/Experimental/DHC/Loads/Heating/BaseClasses/package.order b/Buildings/DHC/Loads/Heating/BaseClasses/package.order
similarity index 100%
rename from Buildings/Experimental/DHC/Loads/Heating/BaseClasses/package.order
rename to Buildings/DHC/Loads/Heating/BaseClasses/package.order
diff --git a/Buildings/Experimental/DHC/Loads/Heating/BuildingTimeSeriesWithETS.mo b/Buildings/DHC/Loads/Heating/BuildingTimeSeriesWithETS.mo
similarity index 86%
rename from Buildings/Experimental/DHC/Loads/Heating/BuildingTimeSeriesWithETS.mo
rename to Buildings/DHC/Loads/Heating/BuildingTimeSeriesWithETS.mo
index ad16646d77a..d84d7b2d584 100644
--- a/Buildings/Experimental/DHC/Loads/Heating/BuildingTimeSeriesWithETS.mo
+++ b/Buildings/DHC/Loads/Heating/BuildingTimeSeriesWithETS.mo
@@ -1,8 +1,8 @@
-within Buildings.Experimental.DHC.Loads.Heating;
+within Buildings.DHC.Loads.Heating;
 model BuildingTimeSeriesWithETS
   "Model of a building with loads provided as time series, connected to an ETS for heating"
   extends BaseClasses.PartialBuildingWithETS(
-    redeclare Buildings.Experimental.DHC.Loads.BaseClasses.Examples.BaseClasses.BuildingTimeSeries bui(
+    redeclare Buildings.DHC.Loads.BaseClasses.BuildingTimeSeries bui(
       final have_heaWat=true,
       final have_chiWat=false,
       final have_hotWat=false,
@@ -46,10 +46,10 @@ protected
   Documentation(info="<html>
 <p>
 This model is composed of a direct controlled energy transfer station model for heating
-<a href=\"modelica://Buildings/Experimental/DHC/EnergyTransferStations/Heating/Direct.mo\">
-Buildings.Experimental.DHC.EnergyTransferStations.Heating.Direct</a>
-connected to a simplified building model <a href=\"modelica://Buildings/Experimental/DHC/Loads/Heating/BaseClasses/BuildingTimeSeries.mo\">
-Buildings.Experimental.DHC.Loads.Heating.BaseClasses.BuildingTimeSeries</a>
+<a href=\"modelica://Buildings.DHC.ETS.Heating/Direct\">
+Buildings.DHC.ETS.Heating.Direct</a>
+connected to a simplified building model <a href=\"modelica://Buildings.DHC.Loads.BaseClasses.BuildingTimeSeries\">
+Buildings.DHC.Loads.BaseClasses.BuildingTimeSeries</a>
 where the space heating loads are provided as time series.
 </p>
 </html>", revisions="<html>
diff --git a/Buildings/Experimental/DHC/Loads/Heating/Examples/BuildingTimeSeriesWithETS.mo b/Buildings/DHC/Loads/Heating/Examples/BuildingTimeSeriesWithETS.mo
similarity index 87%
rename from Buildings/Experimental/DHC/Loads/Heating/Examples/BuildingTimeSeriesWithETS.mo
rename to Buildings/DHC/Loads/Heating/Examples/BuildingTimeSeriesWithETS.mo
index 4074479adb9..ecda51f157b 100644
--- a/Buildings/Experimental/DHC/Loads/Heating/Examples/BuildingTimeSeriesWithETS.mo
+++ b/Buildings/DHC/Loads/Heating/Examples/BuildingTimeSeriesWithETS.mo
@@ -1,11 +1,11 @@
-within Buildings.Experimental.DHC.Loads.Heating.Examples;
+within Buildings.DHC.Loads.Heating.Examples;
 model BuildingTimeSeriesWithETS
   "Example model of a building with loads provided as time series and
   connected to an ETS for cooling"
   extends Modelica.Icons.Example;
   package Medium=Buildings.Media.Water
     "Medium model";
-  Buildings.Experimental.DHC.Loads.Heating.BuildingTimeSeriesWithETS buiWitETS(filNam="modelica://Buildings/Resources/Data/Experimental/DHC/Loads/Examples/MediumOffice-90.1-2010-5A.mos")
+  Buildings.DHC.Loads.Heating.BuildingTimeSeriesWithETS buiWitETS(filNam="modelica://Buildings/Resources/Data/DHC/Loads/Examples/MediumOffice-90.1-2010-5A.mos")
     "Building Time Series load coupled with ETS"
     annotation (Placement(transformation(extent={{40,-20},{60,0}})));
   Buildings.Fluid.Sources.Boundary_pT supHeaWat(
@@ -49,7 +49,7 @@ equation
         coordinateSystem(
         preserveAspectRatio=false)),
     __Dymola_Commands(
-      file="modelica://Buildings/Resources/Scripts/Dymola/Experimental/DHC/Loads/Heating/Examples/BuildingTimeSeriesWithETS.mos" "Simulate and plot"),
+      file="modelica://Buildings/Resources/Scripts/Dymola/DHC/Loads/Heating/Examples/BuildingTimeSeriesWithETS.mos" "Simulate and plot"),
     experiment(
       StartTime=2592000,
       StopTime=3628800,
diff --git a/Buildings/Experimental/DHC/Loads/Heating/Examples/package.mo b/Buildings/DHC/Loads/Heating/Examples/package.mo
similarity index 55%
rename from Buildings/Experimental/DHC/Loads/Heating/Examples/package.mo
rename to Buildings/DHC/Loads/Heating/Examples/package.mo
index 67c01f1f77e..702b4a873c2 100644
--- a/Buildings/Experimental/DHC/Loads/Heating/Examples/package.mo
+++ b/Buildings/DHC/Loads/Heating/Examples/package.mo
@@ -1,11 +1,11 @@
-within Buildings.Experimental.DHC.Loads.Heating;
+within Buildings.DHC.Loads.Heating;
 package Examples
   extends Modelica.Icons.ExamplesPackage;
 
 annotation (Documentation(info="<html>
 <p>This package contains an example illustrating the use of the model in
-<a href=\"modelica://Buildings.Experimental.DHC.Loads.Cooling\">
-Buildings.Experimental.DHC.Loads.Cooling</a>.
+<a href=\"modelica://Buildings.DHC.Loads.Cooling\">
+Buildings.DHC.Loads.Cooling</a>.
 </p>
 </html>"));
 end Examples;
diff --git a/Buildings/Experimental/DHC/Loads/Heating/Examples/package.order b/Buildings/DHC/Loads/Heating/Examples/package.order
similarity index 100%
rename from Buildings/Experimental/DHC/Loads/Heating/Examples/package.order
rename to Buildings/DHC/Loads/Heating/Examples/package.order
diff --git a/Buildings/Experimental/DHC/Loads/Heating/package.mo b/Buildings/DHC/Loads/Heating/package.mo
similarity index 88%
rename from Buildings/Experimental/DHC/Loads/Heating/package.mo
rename to Buildings/DHC/Loads/Heating/package.mo
index 018fc983aaf..6b1ec5583c5 100644
--- a/Buildings/Experimental/DHC/Loads/Heating/package.mo
+++ b/Buildings/DHC/Loads/Heating/package.mo
@@ -1,4 +1,4 @@
-within Buildings.Experimental.DHC.Loads;
+within Buildings.DHC.Loads;
 package Heating "This package contains models for loads used in district heating systems."
   extends Modelica.Icons.VariantsPackage;
 
diff --git a/Buildings/Experimental/DHC/Loads/Heating/package.order b/Buildings/DHC/Loads/Heating/package.order
similarity index 100%
rename from Buildings/Experimental/DHC/Loads/Heating/package.order
rename to Buildings/DHC/Loads/Heating/package.order
diff --git a/Buildings/Experimental/DHC/Loads/HotWater/BaseClasses/HeatExchangerPumpController.mo b/Buildings/DHC/Loads/HotWater/BaseClasses/HeatExchangerPumpController.mo
similarity index 98%
rename from Buildings/Experimental/DHC/Loads/HotWater/BaseClasses/HeatExchangerPumpController.mo
rename to Buildings/DHC/Loads/HotWater/BaseClasses/HeatExchangerPumpController.mo
index 255f9d091a2..acab8625d2f 100644
--- a/Buildings/Experimental/DHC/Loads/HotWater/BaseClasses/HeatExchangerPumpController.mo
+++ b/Buildings/DHC/Loads/HotWater/BaseClasses/HeatExchangerPumpController.mo
@@ -1,4 +1,4 @@
-within Buildings.Experimental.DHC.Loads.HotWater.BaseClasses;
+within Buildings.DHC.Loads.HotWater.BaseClasses;
 block HeatExchangerPumpController
   "Controller for pump of storage tank with external heat exchanger"
   parameter Modelica.Units.SI.MassFlowRate mDom_flow_nominal
diff --git a/Buildings/Experimental/DHC/Loads/HotWater/BaseClasses/PartialFourPortDHW.mo b/Buildings/DHC/Loads/HotWater/BaseClasses/PartialFourPortDHW.mo
similarity index 98%
rename from Buildings/Experimental/DHC/Loads/HotWater/BaseClasses/PartialFourPortDHW.mo
rename to Buildings/DHC/Loads/HotWater/BaseClasses/PartialFourPortDHW.mo
index 1a327853d09..16844c1ca8a 100644
--- a/Buildings/Experimental/DHC/Loads/HotWater/BaseClasses/PartialFourPortDHW.mo
+++ b/Buildings/DHC/Loads/HotWater/BaseClasses/PartialFourPortDHW.mo
@@ -1,4 +1,4 @@
-within Buildings.Experimental.DHC.Loads.HotWater.BaseClasses;
+within Buildings.DHC.Loads.HotWater.BaseClasses;
 partial model PartialFourPortDHW
   "A partial model for domestic water heating"
   extends Modelica.Blocks.Icons.Block;
diff --git a/Buildings/Experimental/DHC/Loads/HotWater/BaseClasses/TankChargingController.mo b/Buildings/DHC/Loads/HotWater/BaseClasses/TankChargingController.mo
similarity index 98%
rename from Buildings/Experimental/DHC/Loads/HotWater/BaseClasses/TankChargingController.mo
rename to Buildings/DHC/Loads/HotWater/BaseClasses/TankChargingController.mo
index 0cb20c93238..89f883e06cc 100644
--- a/Buildings/Experimental/DHC/Loads/HotWater/BaseClasses/TankChargingController.mo
+++ b/Buildings/DHC/Loads/HotWater/BaseClasses/TankChargingController.mo
@@ -1,4 +1,4 @@
-within Buildings.Experimental.DHC.Loads.HotWater.BaseClasses;
+within Buildings.DHC.Loads.HotWater.BaseClasses;
 block TankChargingController
   "Controller to enable or disable storage tank charging"
 
diff --git a/Buildings/Experimental/DHC/Loads/HotWater/BaseClasses/TankValveController.mo b/Buildings/DHC/Loads/HotWater/BaseClasses/TankValveController.mo
similarity index 97%
rename from Buildings/Experimental/DHC/Loads/HotWater/BaseClasses/TankValveController.mo
rename to Buildings/DHC/Loads/HotWater/BaseClasses/TankValveController.mo
index 832a45a09c7..7b5b7d4af7f 100644
--- a/Buildings/Experimental/DHC/Loads/HotWater/BaseClasses/TankValveController.mo
+++ b/Buildings/DHC/Loads/HotWater/BaseClasses/TankValveController.mo
@@ -1,4 +1,4 @@
-within Buildings.Experimental.DHC.Loads.HotWater.BaseClasses;
+within Buildings.DHC.Loads.HotWater.BaseClasses;
 block TankValveController
   "Controller to divert the water to the middle or bottom of the tank"
 
diff --git a/Buildings/DHC/Loads/HotWater/BaseClasses/package.mo b/Buildings/DHC/Loads/HotWater/BaseClasses/package.mo
new file mode 100644
index 00000000000..7c736b09f77
--- /dev/null
+++ b/Buildings/DHC/Loads/HotWater/BaseClasses/package.mo
@@ -0,0 +1,12 @@
+within Buildings.DHC.Loads.HotWater;
+package BaseClasses "Package with base classes that are used by multiple models"
+  extends Modelica.Icons.BasesPackage;
+
+annotation (Documentation(info="<html>
+<p>
+This package contains base classes that are used to construct the classes in
+<a href=\"modelica://Buildings.DHC.Loads.HotWater\">
+Buildings.DHC.Loads.Heating.DHW</a>.
+</p>
+</html>"));
+end BaseClasses;
diff --git a/Buildings/Experimental/DHC/Loads/HotWater/BaseClasses/package.order b/Buildings/DHC/Loads/HotWater/BaseClasses/package.order
similarity index 100%
rename from Buildings/Experimental/DHC/Loads/HotWater/BaseClasses/package.order
rename to Buildings/DHC/Loads/HotWater/BaseClasses/package.order
diff --git a/Buildings/Experimental/DHC/Loads/HotWater/Data/GenericDomesticHotWaterWithHeatExchanger.mo b/Buildings/DHC/Loads/HotWater/Data/GenericDomesticHotWaterWithHeatExchanger.mo
similarity index 98%
rename from Buildings/Experimental/DHC/Loads/HotWater/Data/GenericDomesticHotWaterWithHeatExchanger.mo
rename to Buildings/DHC/Loads/HotWater/Data/GenericDomesticHotWaterWithHeatExchanger.mo
index 15d8253b69c..ad5bf9a853f 100644
--- a/Buildings/Experimental/DHC/Loads/HotWater/Data/GenericDomesticHotWaterWithHeatExchanger.mo
+++ b/Buildings/DHC/Loads/HotWater/Data/GenericDomesticHotWaterWithHeatExchanger.mo
@@ -1,4 +1,4 @@
-within Buildings.Experimental.DHC.Loads.HotWater.Data;
+within Buildings.DHC.Loads.HotWater.Data;
 record GenericDomesticHotWaterWithHeatExchanger
   "Equipment specifications for a heating water tank with external heat exchanger to heat domestic hot water"
   extends Modelica.Icons.Record;
diff --git a/Buildings/Experimental/DHC/Loads/HotWater/Data/package.mo b/Buildings/DHC/Loads/HotWater/Data/package.mo
similarity index 83%
rename from Buildings/Experimental/DHC/Loads/HotWater/Data/package.mo
rename to Buildings/DHC/Loads/HotWater/Data/package.mo
index b2475fe7f87..0e7e943c7f9 100644
--- a/Buildings/Experimental/DHC/Loads/HotWater/Data/package.mo
+++ b/Buildings/DHC/Loads/HotWater/Data/package.mo
@@ -1,4 +1,4 @@
-within Buildings.Experimental.DHC.Loads.HotWater;
+within Buildings.DHC.Loads.HotWater;
 package Data "Package for data related to hot water generation"
   extends Modelica.Icons.MaterialPropertiesPackage;
 annotation (preferredView="info", Documentation(info="<html>
diff --git a/Buildings/Experimental/DHC/Loads/HotWater/Data/package.order b/Buildings/DHC/Loads/HotWater/Data/package.order
similarity index 100%
rename from Buildings/Experimental/DHC/Loads/HotWater/Data/package.order
rename to Buildings/DHC/Loads/HotWater/Data/package.order
diff --git a/Buildings/Experimental/DHC/Loads/HotWater/DirectHeatExchangerWithElectricHeat.mo b/Buildings/DHC/Loads/HotWater/DirectHeatExchangerWithElectricHeat.mo
similarity index 97%
rename from Buildings/Experimental/DHC/Loads/HotWater/DirectHeatExchangerWithElectricHeat.mo
rename to Buildings/DHC/Loads/HotWater/DirectHeatExchangerWithElectricHeat.mo
index 0fcafb4f048..496c1a3f09e 100644
--- a/Buildings/Experimental/DHC/Loads/HotWater/DirectHeatExchangerWithElectricHeat.mo
+++ b/Buildings/DHC/Loads/HotWater/DirectHeatExchangerWithElectricHeat.mo
@@ -1,8 +1,8 @@
-within Buildings.Experimental.DHC.Loads.HotWater;
+within Buildings.DHC.Loads.HotWater;
 model DirectHeatExchangerWithElectricHeat
   "A model for generating hot water using a district heat exchanger and supplemental electric resistance"
   extends
-    Buildings.Experimental.DHC.Loads.HotWater.BaseClasses.PartialFourPortDHW;
+    Buildings.DHC.Loads.HotWater.BaseClasses.PartialFourPortDHW;
   parameter Modelica.Units.SI.Efficiency eps(min=0,max=1) = 0.8 "Heat exchanger effectiveness";
   parameter Boolean have_eleHea = true "True if has auxiliary electric heater";
   parameter Modelica.Units.SI.HeatFlowRate QMax_flow(min=0) = Modelica.Constants.inf "Maximum heat flow rate for electric heater (positive)"
@@ -97,7 +97,7 @@ the temperature of produced hot water to setpoint, if the district supply
 water is not hot enough.
 </p>
 <p align=\"center\">
-<img alt=\"image\" src=\"modelica://Buildings/Resources/Images/Experimental/DHC/Loads/HotWater/DirectHeatExchangerWithElectricHeat.png\"/>
+<img alt=\"image\" src=\"modelica://Buildings/Resources/Images/DHC/Loads/HotWater/DirectHeatExchangerWithElectricHeat.png\"/>
 </p>
 <p>
 It is based on Fig. 5 in <i>Evaluations of different domestic hot water
diff --git a/Buildings/Experimental/DHC/Loads/HotWater/Examples/HeaterAndFixtureDirectHeatExchangerWithElectricHeat.mo b/Buildings/DHC/Loads/HotWater/Examples/HeaterAndFixtureDirectHeatExchangerWithElectricHeat.mo
similarity index 90%
rename from Buildings/Experimental/DHC/Loads/HotWater/Examples/HeaterAndFixtureDirectHeatExchangerWithElectricHeat.mo
rename to Buildings/DHC/Loads/HotWater/Examples/HeaterAndFixtureDirectHeatExchangerWithElectricHeat.mo
index 7f20683972c..320cb079285 100644
--- a/Buildings/Experimental/DHC/Loads/HotWater/Examples/HeaterAndFixtureDirectHeatExchangerWithElectricHeat.mo
+++ b/Buildings/DHC/Loads/HotWater/Examples/HeaterAndFixtureDirectHeatExchangerWithElectricHeat.mo
@@ -1,4 +1,4 @@
-within Buildings.Experimental.DHC.Loads.HotWater.Examples;
+within Buildings.DHC.Loads.HotWater.Examples;
 model HeaterAndFixtureDirectHeatExchangerWithElectricHeat
   "Example model for direct heat exchanger with auxiliary electric heater"
   extends Modelica.Icons.Example;
@@ -11,7 +11,7 @@ model HeaterAndFixtureDirectHeatExchangerWithElectricHeat
     annotation (Placement(transformation(extent={{-10,-10},{10,10}},
         rotation=90,
         origin={0,-50})));
-  Buildings.Experimental.DHC.Loads.HotWater.ThermostaticMixingValve theMixVal(redeclare
+  Buildings.DHC.Loads.HotWater.ThermostaticMixingValve theMixVal(redeclare
       package                                                                                   Medium = Medium,
       mMix_flow_nominal=1) "Ideal thermostatic mixing valve"
     annotation (Placement(transformation(extent={{-10,-12},{10,8}})));
@@ -42,7 +42,7 @@ model HeaterAndFixtureDirectHeatExchangerWithElectricHeat
       displayUnit="degC") = 308.15)
     "Temperature setpoint for mixed water supply to fixture"
     annotation (Placement(transformation(extent={{-100,20},{-80,40}})));
-  Buildings.Experimental.DHC.Loads.HotWater.DirectHeatExchangerWithElectricHeat gen(
+  Buildings.DHC.Loads.HotWater.DirectHeatExchangerWithElectricHeat gen(
     redeclare package MediumDom = Medium,
     redeclare package MediumHea = Medium,
     mDom_flow_nominal=1,
@@ -52,13 +52,13 @@ model HeaterAndFixtureDirectHeatExchangerWithElectricHeat
   Modelica.Blocks.Sources.CombiTimeTable sch(
     tableOnFile=true,
     tableName="tab1",
-    fileName=Modelica.Utilities.Files.loadResource("modelica://Buildings/Resources/Data/Experimental/DHC/Loads/HotWater/DHW_ApartmentMidRise.mos"),
+    fileName=Modelica.Utilities.Files.loadResource("modelica://Buildings/Resources/Data/DHC/Loads/HotWater/DHW_ApartmentMidRise.mos"),
     smoothness=Modelica.Blocks.Types.Smoothness.ContinuousDerivative,
     extrapolation=Modelica.Blocks.Types.Extrapolation.Periodic)
     "Domestic hot water fixture draw fraction schedule"
     annotation (Placement(transformation(extent={{-100,50},{-80,70}})));
 
-  Buildings.Experimental.DHC.Loads.HotWater.DirectHeatExchangerWithElectricHeat genNoEle(
+  Buildings.DHC.Loads.HotWater.DirectHeatExchangerWithElectricHeat genNoEle(
     redeclare package MediumDom = Medium,
     redeclare package MediumHea = Medium,
     have_eleHea=false,
@@ -66,7 +66,7 @@ model HeaterAndFixtureDirectHeatExchangerWithElectricHeat
     mHea_flow_nominal=1)
     "Hot water generated by heat exchanger without auxiliary heat"
     annotation (Placement(transformation(extent={{32,-12},{52,8}})));
-  Buildings.Experimental.DHC.Loads.HotWater.ThermostaticMixingValve theMixValNoEle(redeclare
+  Buildings.DHC.Loads.HotWater.ThermostaticMixingValve theMixValNoEle(redeclare
       package                                                                                        Medium = Medium,
       mMix_flow_nominal=1) "Ideal thermostatic mixing valve"
     annotation (Placement(transformation(extent={{70,-12},{90,8}})));
@@ -116,7 +116,7 @@ equation
   connect(genNoEle.port_aDom, sinDis.ports[3]) annotation (Line(points={{32,4},{
           24,4},{24,-28},{-71.3333,-28},{-71.3333,-40}}, color={0,127,255}));
   annotation (__Dymola_Commands(
-      file="modelica://Buildings/Resources/Scripts/Dymola/Experimental/DHC/Loads/HotWater/Examples/HeaterAndFixtureDirectHeatExchangerWithElectricHeat.mos" "Simulate and plot"),
+      file="modelica://Buildings/Resources/Scripts/Dymola/DHC/Loads/HotWater/Examples/HeaterAndFixtureDirectHeatExchangerWithElectricHeat.mos" "Simulate and plot"),
       Documentation(info="<html>
 <p>
 Example model of a fresh water station that heats up domestic hot water.
diff --git a/Buildings/Experimental/DHC/Loads/HotWater/Examples/StorageTankWithExternalHeatExchanger.mo b/Buildings/DHC/Loads/HotWater/Examples/StorageTankWithExternalHeatExchanger.mo
similarity index 91%
rename from Buildings/Experimental/DHC/Loads/HotWater/Examples/StorageTankWithExternalHeatExchanger.mo
rename to Buildings/DHC/Loads/HotWater/Examples/StorageTankWithExternalHeatExchanger.mo
index 9d6aea1c0b2..7c312148ec4 100644
--- a/Buildings/Experimental/DHC/Loads/HotWater/Examples/StorageTankWithExternalHeatExchanger.mo
+++ b/Buildings/DHC/Loads/HotWater/Examples/StorageTankWithExternalHeatExchanger.mo
@@ -1,11 +1,11 @@
-within Buildings.Experimental.DHC.Loads.HotWater.Examples;
+within Buildings.DHC.Loads.HotWater.Examples;
 model StorageTankWithExternalHeatExchanger
   "Example model for storage tank with external heat exchanger"
   extends Modelica.Icons.Example;
   package Medium = Buildings.Media.Water "Medium model";
   parameter Modelica.Units.SI.Temperature TCol = 273.15+10 "Temperature of domestic cold water supply";
   parameter Modelica.Units.SI.MassFlowRate mHea_flow_nominal = datWatHea.QHex_flow_nominal/4200/(55 - 50) "Tank heater water loop nominal mass flow";
-  parameter Buildings.Experimental.DHC.Loads.HotWater.Data.GenericDomesticHotWaterWithHeatExchanger
+  parameter Buildings.DHC.Loads.HotWater.Data.GenericDomesticHotWaterWithHeatExchanger
     datWatHea(VTan=0.1892706, mDom_flow_nominal=6.52944E-06*1000)
     "Data for heat pump water heater with tank"
     annotation (Placement(transformation(extent={{-80,-60},{-60,-40}})));
@@ -14,7 +14,7 @@ model StorageTankWithExternalHeatExchanger
     tableOnFile=true,
     tableName="tab1",
     fileName=Modelica.Utilities.Files.loadResource(
-        "modelica://Buildings/Resources/Data/Experimental/DHC/Loads/HotWater/DHW_ApartmentMidRise.mos"),
+        "modelica://Buildings/Resources/Data/DHC/Loads/HotWater/DHW_ApartmentMidRise.mos"),
     smoothness=Modelica.Blocks.Types.Smoothness.ContinuousDerivative,
     extrapolation=Modelica.Blocks.Types.Extrapolation.Periodic)
     "Domestic hot water fixture draw fraction schedule"
@@ -32,12 +32,12 @@ model StorageTankWithExternalHeatExchanger
       displayUnit="degC") = 308.15)
     "Temperature setpoint for mixed water supply to fixture"
     annotation (Placement(transformation(extent={{-80,30},{-60,50}})));
-  Buildings.Experimental.DHC.Loads.HotWater.StorageTankWithExternalHeatExchanger
+  Buildings.DHC.Loads.HotWater.StorageTankWithExternalHeatExchanger
     domHotWatTan(redeclare package MediumDom = Medium, redeclare package
       MediumHea = Medium,
     dat=datWatHea)        "Storage tank with external heat exchanger"
     annotation (Placement(transformation(extent={{0,20},{20,40}})));
-  Buildings.Experimental.DHC.Loads.HotWater.ThermostaticMixingValve theMixVal(redeclare
+  Buildings.DHC.Loads.HotWater.ThermostaticMixingValve theMixVal(redeclare
       package                                                                                   Medium = Medium,
       mMix_flow_nominal=1.2*datWatHea.mDom_flow_nominal)
     annotation (Placement(transformation(extent={{40,60},{60,80}})));
@@ -112,7 +112,7 @@ equation
           textString="%name",
           textColor={0,0,255})}),
           __Dymola_Commands(
-      file="modelica://Buildings/Resources/Scripts/Dymola/Experimental/DHC/Loads/HotWater/Examples/StorageTankWithExternalHeatExchanger.mos" "Simulate and plot"),
+      file="modelica://Buildings/Resources/Scripts/Dymola/DHC/Loads/HotWater/Examples/StorageTankWithExternalHeatExchanger.mos" "Simulate and plot"),
 Documentation(info="<html>
 <p>
 Example model of a fresh water station that heats up domestic hot water.
diff --git a/Buildings/Experimental/DHC/Loads/HotWater/Examples/package.mo b/Buildings/DHC/Loads/HotWater/Examples/package.mo
similarity index 88%
rename from Buildings/Experimental/DHC/Loads/HotWater/Examples/package.mo
rename to Buildings/DHC/Loads/HotWater/Examples/package.mo
index 95ca57769fc..9e178aea677 100644
--- a/Buildings/Experimental/DHC/Loads/HotWater/Examples/package.mo
+++ b/Buildings/DHC/Loads/HotWater/Examples/package.mo
@@ -1,4 +1,4 @@
-within Buildings.Experimental.DHC.Loads.HotWater;
+within Buildings.DHC.Loads.HotWater;
 package Examples "Example implementations of district-integrated DHW models"
   extends Modelica.Icons.ExamplesPackage;
 
diff --git a/Buildings/Experimental/DHC/Loads/HotWater/Examples/package.order b/Buildings/DHC/Loads/HotWater/Examples/package.order
similarity index 100%
rename from Buildings/Experimental/DHC/Loads/HotWater/Examples/package.order
rename to Buildings/DHC/Loads/HotWater/Examples/package.order
diff --git a/Buildings/Experimental/DHC/Loads/HotWater/StorageTankWithExternalHeatExchanger.mo b/Buildings/DHC/Loads/HotWater/StorageTankWithExternalHeatExchanger.mo
similarity index 93%
rename from Buildings/Experimental/DHC/Loads/HotWater/StorageTankWithExternalHeatExchanger.mo
rename to Buildings/DHC/Loads/HotWater/StorageTankWithExternalHeatExchanger.mo
index f2795d03ac7..bd6236c6f31 100644
--- a/Buildings/Experimental/DHC/Loads/HotWater/StorageTankWithExternalHeatExchanger.mo
+++ b/Buildings/DHC/Loads/HotWater/StorageTankWithExternalHeatExchanger.mo
@@ -1,11 +1,11 @@
-within Buildings.Experimental.DHC.Loads.HotWater;
+within Buildings.DHC.Loads.HotWater;
 model StorageTankWithExternalHeatExchanger
   "A model of a storage tank with external heat exchanger to produce hot water"
   extends
-    Buildings.Experimental.DHC.Loads.HotWater.BaseClasses.PartialFourPortDHW(
+    Buildings.DHC.Loads.HotWater.BaseClasses.PartialFourPortDHW(
     final allowFlowReversalHea=false);
 
-  parameter Buildings.Experimental.DHC.Loads.HotWater.Data.GenericDomesticHotWaterWithHeatExchanger
+  parameter Buildings.DHC.Loads.HotWater.Data.GenericDomesticHotWaterWithHeatExchanger
     dat "Performance data"
     annotation (Placement(transformation(extent={{60,80},{80,100}})));
 
@@ -82,11 +82,11 @@ model StorageTankWithExternalHeatExchanger
     "Fluid temperature at the bottom of the tank"
     annotation (Placement(transformation(extent={{40,-30},{60,-10}})));
 
-  Buildings.Experimental.DHC.Loads.HotWater.BaseClasses.HeatExchangerPumpController conPum(final mDom_flow_nominal=dat.mDom_flow_nominal,
+  Buildings.DHC.Loads.HotWater.BaseClasses.HeatExchangerPumpController conPum(final mDom_flow_nominal=dat.mDom_flow_nominal,
       final dpPum_nominal=dat.dpHexHea_nominal)
     "Controller for pump of heat exchanger"
     annotation (Placement(transformation(extent={{-80,-10},{-60,10}})));
-  Buildings.Experimental.DHC.Loads.HotWater.BaseClasses.TankChargingController conCha "Controller for tank charge signal"
+  Buildings.DHC.Loads.HotWater.BaseClasses.TankChargingController conCha "Controller for tank charge signal"
     annotation (Placement(transformation(extent={{72,-90},{92,-70}})));
 
   Buildings.Fluid.Actuators.Valves.ThreeWayLinear divVal(
@@ -102,7 +102,7 @@ model StorageTankWithExternalHeatExchanger
     m_flow_nominal=dat.mHex_flow_nominal)
     "Temperature sensor for return heating water from heat exchanger"
     annotation (Placement(transformation(extent={{-20,-60},{0,-40}})));
-  Buildings.Experimental.DHC.Loads.HotWater.BaseClasses.TankValveController conVal "Diversion valve controller"
+  Buildings.DHC.Loads.HotWater.BaseClasses.TankValveController conVal "Diversion valve controller"
     annotation (Placement(transformation(extent={{-20,-90},{0,-70}})));
 
   Buildings.Controls.OBC.CDL.Reals.AddParameter dTHexApp(p=dat.dTHexApp_nominal)
@@ -201,11 +201,11 @@ The storage tank model is described in
 <a href=\"modelica://Buildings.Fluid.Storage.StratifiedEnhancedInternalHex\">
 Buildings.Fluid.Storage.StratifiedEnhancedInternalHex</a>.
 The heat pump and storage tank system should be parameterized altogether using
-<a href=\"modelica://Buildings.Experimental.DHC.Loads.HotWater.Data.GenericDomesticHotWaterWithHeatExchanger\">
-Buildings.Experimental.DHC.Loads.HotWater.Data.GenericDomesticHotWaterWithHeatExchanger</a>.
+<a href=\"modelica://Buildings.DHC.Loads.HotWater.Data.GenericDomesticHotWaterWithHeatExchanger\">
+Buildings.DHC.Loads.HotWater.Data.GenericDomesticHotWaterWithHeatExchanger</a>.
 </p>
 <p align=\"center\">
-<img alt=\"image\" src=\"modelica://Buildings/Resources/Images/Experimental/DHC/Loads/HotWater/StorageTankWithExternalHeatExchanger.png\"/>
+<img alt=\"image\" src=\"modelica://Buildings/Resources/Images/DHC/Loads/HotWater/StorageTankWithExternalHeatExchanger.png\"/>
 </p>
 <p>
 It is based on Fig. 3 in <i>Evaluations of different domestic hot water
@@ -218,8 +218,8 @@ https://www.ashrae.org/technical-resources/aedgs/zero-energy-aedg-free-download<
 </p>
 <p>
 For a model that connects this hot water system to a heat pump, see
-<a href=\"modelica://Buildings.Experimental.DHC.EnergyTransferStations.Combined.Subsystems.HeatPumpDHWTank\">
-Buildings.Experimental.DHC.EnergyTransferStations.Combined.Subsystems.HeatPumpDHWTank</a>.
+<a href=\"modelica://Buildings.DHC.ETS.Combined.Subsystems.HeatPumpDHWTank\">
+Buildings.DHC.ETS.Combined.Subsystems.HeatPumpDHWTank</a>.
 </p>
 </html>", revisions="<html>
 <ul>
diff --git a/Buildings/Experimental/DHC/Loads/HotWater/ThermostaticMixingValve.mo b/Buildings/DHC/Loads/HotWater/ThermostaticMixingValve.mo
similarity index 99%
rename from Buildings/Experimental/DHC/Loads/HotWater/ThermostaticMixingValve.mo
rename to Buildings/DHC/Loads/HotWater/ThermostaticMixingValve.mo
index 1996100dbd3..ac71e20887d 100644
--- a/Buildings/Experimental/DHC/Loads/HotWater/ThermostaticMixingValve.mo
+++ b/Buildings/DHC/Loads/HotWater/ThermostaticMixingValve.mo
@@ -1,4 +1,4 @@
-within Buildings.Experimental.DHC.Loads.HotWater;
+within Buildings.DHC.Loads.HotWater;
 model ThermostaticMixingValve
   "A model for a thermostatic mixing valve"
   replaceable package Medium = Buildings.Media.Water "Water media model";
diff --git a/Buildings/Experimental/DHC/Loads/HotWater/package.mo b/Buildings/DHC/Loads/HotWater/package.mo
similarity index 92%
rename from Buildings/Experimental/DHC/Loads/HotWater/package.mo
rename to Buildings/DHC/Loads/HotWater/package.mo
index 4401b76ccd2..fd5ba1295fa 100644
--- a/Buildings/Experimental/DHC/Loads/HotWater/package.mo
+++ b/Buildings/DHC/Loads/HotWater/package.mo
@@ -1,4 +1,4 @@
-within Buildings.Experimental.DHC.Loads;
+within Buildings.DHC.Loads;
 package HotWater "Package of models for domestic hot water generation and loads served by district networks"
    extends Modelica.Icons.VariantsPackage;
 
diff --git a/Buildings/Experimental/DHC/Loads/HotWater/package.order b/Buildings/DHC/Loads/HotWater/package.order
similarity index 100%
rename from Buildings/Experimental/DHC/Loads/HotWater/package.order
rename to Buildings/DHC/Loads/HotWater/package.order
diff --git a/Buildings/Experimental/DHC/Loads/Steam/BaseClasses/ControlVolumeCondensation.mo b/Buildings/DHC/Loads/Steam/BaseClasses/ControlVolumeCondensation.mo
similarity index 86%
rename from Buildings/Experimental/DHC/Loads/Steam/BaseClasses/ControlVolumeCondensation.mo
rename to Buildings/DHC/Loads/Steam/BaseClasses/ControlVolumeCondensation.mo
index 311d047ac8c..0cf8ea24253 100644
--- a/Buildings/Experimental/DHC/Loads/Steam/BaseClasses/ControlVolumeCondensation.mo
+++ b/Buildings/DHC/Loads/Steam/BaseClasses/ControlVolumeCondensation.mo
@@ -1,8 +1,8 @@
-within Buildings.Experimental.DHC.Loads.Steam.BaseClasses;
+within Buildings.DHC.Loads.Steam.BaseClasses;
 model ControlVolumeCondensation
   "Control volume model exhibiting the condensation process of water"
   extends
-    Buildings.Experimental.DHC.BaseClasses.Steam.PartialSaturatedControlVolume(
+    Buildings.DHC.BaseClasses.Steam.PartialSaturatedControlVolume(
       redeclare final package Medium_a=MediumSte,
       redeclare final package Medium_b=MediumWat);
 equation
@@ -41,8 +41,8 @@ This model represents a condensation process of water with
 liquid and vapor phases in equilibrium and at a saturated state.
 Further information regarding the model formulation and assumptions
 are in the base class
-<a href=\"modelica://Buildings.Experimental.DHC.BaseClasses.Steam.PartialSaturatedControlVolume\">
-Buildings.Experimental.DHC.BaseClasses.Steam.PartialSaturatedControlVolume</a>.
+<a href=\"modelica://Buildings.DHC.BaseClasses.Steam.PartialSaturatedControlVolume\">
+Buildings.DHC.BaseClasses.Steam.PartialSaturatedControlVolume</a>.
 
 <h4>References </h4>
 <p>
diff --git a/Buildings/Experimental/DHC/Loads/Steam/BaseClasses/Examples/ControlVolumeCondensation.mo b/Buildings/DHC/Loads/Steam/BaseClasses/Examples/ControlVolumeCondensation.mo
similarity index 92%
rename from Buildings/Experimental/DHC/Loads/Steam/BaseClasses/Examples/ControlVolumeCondensation.mo
rename to Buildings/DHC/Loads/Steam/BaseClasses/Examples/ControlVolumeCondensation.mo
index 09c87a57693..e30f7271de4 100644
--- a/Buildings/Experimental/DHC/Loads/Steam/BaseClasses/Examples/ControlVolumeCondensation.mo
+++ b/Buildings/DHC/Loads/Steam/BaseClasses/Examples/ControlVolumeCondensation.mo
@@ -1,4 +1,4 @@
-within Buildings.Experimental.DHC.Loads.Steam.BaseClasses.Examples;
+within Buildings.DHC.Loads.Steam.BaseClasses.Examples;
 model ControlVolumeCondensation
   "Example model for heat transfer with the condensation control volume"
   extends Modelica.Icons.Example;
@@ -11,7 +11,7 @@ package MediumWat =
       Buildings.Media.Specialized.Water.TemperatureDependentDensity
     "Water medium - Medium model for port_b (outlet)";
 
-  Buildings.Experimental.DHC.Loads.Steam.BaseClasses.ControlVolumeCondensation volDyn(
+  Buildings.DHC.Loads.Steam.BaseClasses.ControlVolumeCondensation volDyn(
     V=1,
     redeclare package MediumWat = MediumWat,
     redeclare package MediumSte = MediumSte,
@@ -19,7 +19,7 @@ package MediumWat =
     energyDynamics=Modelica.Fluid.Types.Dynamics.FixedInitial,
     allowFlowReversal=true) "Dynamic volume"
     annotation (Placement(transformation(extent={{20,0},{40,-20}})));
-  Buildings.Experimental.DHC.Loads.Steam.BaseClasses.ControlVolumeCondensation volSte(
+  Buildings.DHC.Loads.Steam.BaseClasses.ControlVolumeCondensation volSte(
     V=1,
     redeclare package MediumWat = MediumWat,
     redeclare package MediumSte = MediumSte,
@@ -95,6 +95,6 @@ First implementation.
 </ul>
 </html>"),
 experiment(Tolerance=1E-6, StopTime=1.0),
-__Dymola_Commands(file="modelica://Buildings/Resources/Scripts/Dymola/Experimental/DHC/Loads/Steam/BaseClasses/Examples/ControlVolumeCondensation.mos"
+__Dymola_Commands(file="modelica://Buildings/Resources/Scripts/Dymola/DHC/Loads/Steam/BaseClasses/Examples/ControlVolumeCondensation.mos"
         "Simulate and plot"));
 end ControlVolumeCondensation;
diff --git a/Buildings/Experimental/DHC/Loads/Steam/BaseClasses/Examples/SteamTrap.mo b/Buildings/DHC/Loads/Steam/BaseClasses/Examples/SteamTrap.mo
similarity index 94%
rename from Buildings/Experimental/DHC/Loads/Steam/BaseClasses/Examples/SteamTrap.mo
rename to Buildings/DHC/Loads/Steam/BaseClasses/Examples/SteamTrap.mo
index ea1df6b5de1..65b815dbc61 100644
--- a/Buildings/Experimental/DHC/Loads/Steam/BaseClasses/Examples/SteamTrap.mo
+++ b/Buildings/DHC/Loads/Steam/BaseClasses/Examples/SteamTrap.mo
@@ -1,4 +1,4 @@
-within Buildings.Experimental.DHC.Loads.Steam.BaseClasses.Examples;
+within Buildings.DHC.Loads.Steam.BaseClasses.Examples;
 model SteamTrap "Example model to demonstrate the steam trap"
   extends Modelica.Icons.Example;
 
@@ -35,7 +35,7 @@ model SteamTrap "Example model to demonstrate the steam trap"
     nPorts=1)
     "Sink"
     annotation (Placement(transformation(extent={{90,0},{70,20}})));
-  Buildings.Experimental.DHC.Loads.Steam.BaseClasses.SteamTrap steTra(
+  Buildings.DHC.Loads.Steam.BaseClasses.SteamTrap steTra(
     redeclare package Medium = MediumWat,
     m_flow_nominal=m_flow_nominal,
     show_T=true)
@@ -74,7 +74,7 @@ equation
   annotation (Icon(coordinateSystem(preserveAspectRatio=false)), Diagram(
         coordinateSystem(preserveAspectRatio=false)),
   experiment(Tolerance=1e-6, StopTime=180.0),
-__Dymola_Commands(file="modelica://Buildings/Resources/Scripts/Dymola/Experimental/DHC/Loads/Steam/BaseClasses/Examples/SteamTrap.mos"
+__Dymola_Commands(file="modelica://Buildings/Resources/Scripts/Dymola/DHC/Loads/Steam/BaseClasses/Examples/SteamTrap.mos"
         "Simulate and plot"),
     Documentation(info="<html>
 <p>
diff --git a/Buildings/Experimental/DHC/Loads/Steam/BaseClasses/Examples/ValveSelfActing.mo b/Buildings/DHC/Loads/Steam/BaseClasses/Examples/ValveSelfActing.mo
similarity index 94%
rename from Buildings/Experimental/DHC/Loads/Steam/BaseClasses/Examples/ValveSelfActing.mo
rename to Buildings/DHC/Loads/Steam/BaseClasses/Examples/ValveSelfActing.mo
index a7b89c0c0ca..6b4fa755921 100644
--- a/Buildings/Experimental/DHC/Loads/Steam/BaseClasses/Examples/ValveSelfActing.mo
+++ b/Buildings/DHC/Loads/Steam/BaseClasses/Examples/ValveSelfActing.mo
@@ -1,4 +1,4 @@
-within Buildings.Experimental.DHC.Loads.Steam.BaseClasses.Examples;
+within Buildings.DHC.Loads.Steam.BaseClasses.Examples;
 model ValveSelfActing
   "Example model for self-acting steam valve with a noisy inlet pressure input"
   extends Modelica.Icons.Example;
@@ -8,7 +8,7 @@ model ValveSelfActing
   parameter Modelica.Units.SI.MassFlowRate m_flow_nominal=1
     "Nominal mass flow rate";
 
-  Buildings.Experimental.DHC.Loads.Steam.BaseClasses.ValveSelfActing prv(
+  Buildings.DHC.Loads.Steam.BaseClasses.ValveSelfActing prv(
     redeclare final package Medium = MediumSte,
     m_flow_nominal=m_flow_nominal,
     show_T=true,
@@ -68,7 +68,7 @@ equation
     annotation (Line(points={{40,0},{30,0}}, color={0,127,255}));
   annotation (Icon(coordinateSystem(preserveAspectRatio=false)),
     Diagram(coordinateSystem(preserveAspectRatio=false)),
-    __Dymola_Commands(file="modelica://Buildings/Resources/Scripts/Dymola/Experimental/DHC/Loads/Steam/BaseClasses/Examples/ValveSelfActing.mos"
+    __Dymola_Commands(file="modelica://Buildings/Resources/Scripts/Dymola/DHC/Loads/Steam/BaseClasses/Examples/ValveSelfActing.mos"
     "Simulate and plot"),
     experiment(StopTime=15, Tolerance=1e-06),
     Documentation(info="<html>
diff --git a/Buildings/Experimental/DHC/Loads/Steam/BaseClasses/Examples/package.mo b/Buildings/DHC/Loads/Steam/BaseClasses/Examples/package.mo
similarity index 60%
rename from Buildings/Experimental/DHC/Loads/Steam/BaseClasses/Examples/package.mo
rename to Buildings/DHC/Loads/Steam/BaseClasses/Examples/package.mo
index c47cc40ce56..a7b6c382acb 100644
--- a/Buildings/Experimental/DHC/Loads/Steam/BaseClasses/Examples/package.mo
+++ b/Buildings/DHC/Loads/Steam/BaseClasses/Examples/package.mo
@@ -1,12 +1,12 @@
-within Buildings.Experimental.DHC.Loads.Steam.BaseClasses;
+within Buildings.DHC.Loads.Steam.BaseClasses;
 package Examples "Collection of models that illustrate model use and test models"
   extends Modelica.Icons.ExamplesPackage;
 
 annotation (preferredView="info", Documentation(info="<html>
 <p>
 This package contains examples for the use of models that can be found in
-<a href=\"modelica://Buildings.Experimental.DHC.Loads.Steam.BaseClasses\">
-Buildings.Experimental.DHC.Loads.Steam.BaseClasses</a>.
+<a href=\"modelica://Buildings.DHC.Loads.Steam.BaseClasses\">
+Buildings.DHC.Loads.Steam.BaseClasses</a>.
 </p>
 </html>"));
 end Examples;
diff --git a/Buildings/Experimental/DHC/Loads/Steam/BaseClasses/Examples/package.order b/Buildings/DHC/Loads/Steam/BaseClasses/Examples/package.order
similarity index 100%
rename from Buildings/Experimental/DHC/Loads/Steam/BaseClasses/Examples/package.order
rename to Buildings/DHC/Loads/Steam/BaseClasses/Examples/package.order
diff --git a/Buildings/Experimental/DHC/Loads/Steam/BaseClasses/SteamTrap.mo b/Buildings/DHC/Loads/Steam/BaseClasses/SteamTrap.mo
similarity index 98%
rename from Buildings/Experimental/DHC/Loads/Steam/BaseClasses/SteamTrap.mo
rename to Buildings/DHC/Loads/Steam/BaseClasses/SteamTrap.mo
index 9e867621b63..c8764cb4014 100644
--- a/Buildings/Experimental/DHC/Loads/Steam/BaseClasses/SteamTrap.mo
+++ b/Buildings/DHC/Loads/Steam/BaseClasses/SteamTrap.mo
@@ -1,4 +1,4 @@
-within Buildings.Experimental.DHC.Loads.Steam.BaseClasses;
+within Buildings.DHC.Loads.Steam.BaseClasses;
 model SteamTrap "Steam trap with isenthalpic expansion from high to atmospheric
   pressure, followed by a isobaric condensation process as flashed steam
   is brought back to a liquid state"
diff --git a/Buildings/Experimental/DHC/Loads/Steam/BaseClasses/ValveSelfActing.mo b/Buildings/DHC/Loads/Steam/BaseClasses/ValveSelfActing.mo
similarity index 99%
rename from Buildings/Experimental/DHC/Loads/Steam/BaseClasses/ValveSelfActing.mo
rename to Buildings/DHC/Loads/Steam/BaseClasses/ValveSelfActing.mo
index f1dc75856d4..315f043435d 100644
--- a/Buildings/Experimental/DHC/Loads/Steam/BaseClasses/ValveSelfActing.mo
+++ b/Buildings/DHC/Loads/Steam/BaseClasses/ValveSelfActing.mo
@@ -1,4 +1,4 @@
-within Buildings.Experimental.DHC.Loads.Steam.BaseClasses;
+within Buildings.DHC.Loads.Steam.BaseClasses;
 model ValveSelfActing "Ideal pressure reducing valve for steam heating systems"
   extends Buildings.Fluid.Interfaces.PartialTwoPortInterface(
     final allowFlowReversal=false);
diff --git a/Buildings/DHC/Loads/Steam/BaseClasses/package.mo b/Buildings/DHC/Loads/Steam/BaseClasses/package.mo
new file mode 100644
index 00000000000..d00290061dd
--- /dev/null
+++ b/Buildings/DHC/Loads/Steam/BaseClasses/package.mo
@@ -0,0 +1,12 @@
+within Buildings.DHC.Loads.Steam;
+package BaseClasses "Package with base classes for Buildings.DHC.Loads.Steam"
+  extends Modelica.Icons.BasesPackage;
+
+annotation (preferredView="info", Documentation(info="<html>
+<p>
+This package contains base classes that are used to construct the models in
+<a href=\"modelica://Buildings.DHC.Loads.Steam\">
+Buildings.DHC.Loads.Steam</a>.
+</p>
+</html>"));
+end BaseClasses;
diff --git a/Buildings/Experimental/DHC/Loads/Steam/BaseClasses/package.order b/Buildings/DHC/Loads/Steam/BaseClasses/package.order
similarity index 100%
rename from Buildings/Experimental/DHC/Loads/Steam/BaseClasses/package.order
rename to Buildings/DHC/Loads/Steam/BaseClasses/package.order
diff --git a/Buildings/Experimental/DHC/Loads/Steam/BuildingTimeSeriesAtETS.mo b/Buildings/DHC/Loads/Steam/BuildingTimeSeriesAtETS.mo
similarity index 97%
rename from Buildings/Experimental/DHC/Loads/Steam/BuildingTimeSeriesAtETS.mo
rename to Buildings/DHC/Loads/Steam/BuildingTimeSeriesAtETS.mo
index e48457ad4d1..e1a628dd8db 100644
--- a/Buildings/Experimental/DHC/Loads/Steam/BuildingTimeSeriesAtETS.mo
+++ b/Buildings/DHC/Loads/Steam/BuildingTimeSeriesAtETS.mo
@@ -1,4 +1,4 @@
-within Buildings.Experimental.DHC.Loads.Steam;
+within Buildings.DHC.Loads.Steam;
 model BuildingTimeSeriesAtETS
   "Steam heating building interconnection with the district piping only
   and the load at the ETS provided as a time series."
@@ -80,7 +80,7 @@ model BuildingTimeSeriesAtETS
     "Initial value of mass flow rate"
     annotation(Dialog(tab = "Initialization"));
 
-  // Heating load time series
+  // Buildings.DHC.Loads.Heating load time series
   parameter Boolean tableOnFile=false
     "= true, if table is defined on file or in function usertab"
     annotation (Dialog(tab = "Load Profile", group="Table data definition"));
@@ -185,7 +185,7 @@ model BuildingTimeSeriesAtETS
     final m_flow_start=m_flow_start)
     "Condensate return pump"
     annotation (Placement(transformation(extent={{50,-70},{70,-50}})));
-  Buildings.Experimental.DHC.Loads.Steam.BaseClasses.ControlVolumeCondensation vol(
+  Buildings.DHC.Loads.Steam.BaseClasses.ControlVolumeCondensation vol(
     redeclare final package MediumSte = MediumSte,
     redeclare final package MediumWat = MediumWat,
     final allowFlowReversal=allowFlowReversal,
@@ -196,7 +196,7 @@ model BuildingTimeSeriesAtETS
     final V=V)
     "Steam side of the heat exchanger, modeled as a steady state control volume"
     annotation (Placement(transformation(extent={{-60,-50},{-40,-70}})));
-  Buildings.Experimental.DHC.Loads.Steam.BaseClasses.SteamTrap steTra(
+  Buildings.DHC.Loads.Steam.BaseClasses.SteamTrap steTra(
     redeclare final package Medium = MediumWat,
     final allowFlowReversal=allowFlowReversal,
     final m_flow_nominal=m_flow_nominal,
@@ -218,7 +218,7 @@ model BuildingTimeSeriesAtETS
     annotation (Placement(transformation(extent={{0,-40},{20,-20}})));
   Modelica.Blocks.Math.Division m_flow "Mass flow"
     annotation (Placement(transformation(extent={{32,-34},{52,-14}})));
-  Buildings.Experimental.DHC.Loads.Steam.BaseClasses.ValveSelfActing prv(
+  Buildings.DHC.Loads.Steam.BaseClasses.ValveSelfActing prv(
     redeclare final package Medium = MediumSte,
     final m_flow_nominal=m_flow_nominal,
     final show_T=show_T,
@@ -326,7 +326,7 @@ availble as a time series data input. Thus, the building-side piping and equipem
 is not included in this model, as depicted below.
 </p>
 <p>
-<img src=\"modelica://Buildings/Resources/Images/Experimental/DHC/Loads/Steam/BuildingTimeSeriesAtETS.png\" alt=\"steamBuilding\"/>.
+<img src=\"modelica://Buildings/Resources/Images/DHC/Loads/Steam/BuildingTimeSeriesAtETS.png\" alt=\"steamBuilding\"/>.
 </p>
 <h4> Implementation</h4>
 <p>
diff --git a/Buildings/Experimental/DHC/Loads/Steam/Examples/BuildingTimeSeriesAtETS.mo b/Buildings/DHC/Loads/Steam/Examples/BuildingTimeSeriesAtETS.mo
similarity index 91%
rename from Buildings/Experimental/DHC/Loads/Steam/Examples/BuildingTimeSeriesAtETS.mo
rename to Buildings/DHC/Loads/Steam/Examples/BuildingTimeSeriesAtETS.mo
index f32a5d017dc..20e5f0af089 100644
--- a/Buildings/Experimental/DHC/Loads/Steam/Examples/BuildingTimeSeriesAtETS.mo
+++ b/Buildings/DHC/Loads/Steam/Examples/BuildingTimeSeriesAtETS.mo
@@ -1,4 +1,4 @@
-within Buildings.Experimental.DHC.Loads.Steam.Examples;
+within Buildings.DHC.Loads.Steam.Examples;
 model BuildingTimeSeriesAtETS
   "Example model for time series load with external read-in file."
   extends Modelica.Icons.Example;
@@ -18,7 +18,7 @@ model BuildingTimeSeriesAtETS
   parameter Modelica.Units.SI.Power Q_flow_nominal= 2e4
     "Nominal heat flow rate";
 
-  Buildings.Experimental.DHC.Loads.Steam.BuildingTimeSeriesAtETS bui(
+  Buildings.DHC.Loads.Steam.BuildingTimeSeriesAtETS bui(
     redeclare package MediumSte = MediumSte,
     redeclare package MediumWat = MediumWat,
     have_prv=true,
@@ -61,7 +61,7 @@ equation
       StopTime=1814400,
       Tolerance=1e-06),
 __Dymola_Commands(file=
-  "modelica://Buildings/Resources/Scripts/Dymola/Experimental/DHC/Loads/Steam/Examples/BuildingTimeSeriesAtETS.mos"
+  "modelica://Buildings/Resources/Scripts/Dymola/DHC/Loads/Steam/Examples/BuildingTimeSeriesAtETS.mos"
   "Simulate and plot"),
     Documentation(info="<html>
 <p>
diff --git a/Buildings/Experimental/DHC/Loads/Steam/Examples/package.mo b/Buildings/DHC/Loads/Steam/Examples/package.mo
similarity index 63%
rename from Buildings/Experimental/DHC/Loads/Steam/Examples/package.mo
rename to Buildings/DHC/Loads/Steam/Examples/package.mo
index ebf73cfeef6..809a0959715 100644
--- a/Buildings/Experimental/DHC/Loads/Steam/Examples/package.mo
+++ b/Buildings/DHC/Loads/Steam/Examples/package.mo
@@ -1,12 +1,12 @@
-within Buildings.Experimental.DHC.Loads.Steam;
+within Buildings.DHC.Loads.Steam;
 package Examples "Collection of models that illustrate model use and test models"
   extends Modelica.Icons.ExamplesPackage;
 
 annotation (Documentation(info="<html>
 <p>
 This package contains examples illustrating the use of the models in
-<a href=\"modelica://Buildings.Experimental.DHC.Loads.Steam\">
-Buildings.Experimental.DHC.Loads.Steam</a>.
+<a href=\"modelica://Buildings.DHC.Loads.Steam\">
+Buildings.DHC.Loads.Steam</a>.
 </p>
 </html>"));
 end Examples;
diff --git a/Buildings/Experimental/DHC/Loads/Steam/Examples/package.order b/Buildings/DHC/Loads/Steam/Examples/package.order
similarity index 100%
rename from Buildings/Experimental/DHC/Loads/Steam/Examples/package.order
rename to Buildings/DHC/Loads/Steam/Examples/package.order
diff --git a/Buildings/Experimental/DHC/Loads/Steam/package.mo b/Buildings/DHC/Loads/Steam/package.mo
similarity index 88%
rename from Buildings/Experimental/DHC/Loads/Steam/package.mo
rename to Buildings/DHC/Loads/Steam/package.mo
index 194afbf0fe5..15e849f5d10 100644
--- a/Buildings/Experimental/DHC/Loads/Steam/package.mo
+++ b/Buildings/DHC/Loads/Steam/package.mo
@@ -1,4 +1,4 @@
-within Buildings.Experimental.DHC.Loads;
+within Buildings.DHC.Loads;
 package Steam "Package with models for loads involving steam systems"
   extends Modelica.Icons.VariantsPackage;
 
diff --git a/Buildings/Experimental/DHC/Loads/Steam/package.order b/Buildings/DHC/Loads/Steam/package.order
similarity index 100%
rename from Buildings/Experimental/DHC/Loads/Steam/package.order
rename to Buildings/DHC/Loads/Steam/package.order
diff --git a/Buildings/Experimental/DHC/Loads/package.mo b/Buildings/DHC/Loads/package.mo
similarity index 90%
rename from Buildings/Experimental/DHC/Loads/package.mo
rename to Buildings/DHC/Loads/package.mo
index 12efa669ded..8f487f287cd 100644
--- a/Buildings/Experimental/DHC/Loads/package.mo
+++ b/Buildings/DHC/Loads/package.mo
@@ -1,4 +1,4 @@
-within Buildings.Experimental.DHC;
+within Buildings.DHC;
 package Loads "Models for computing thermal loads served by the DES"
   extends Modelica.Icons.VariantsPackage;
 
diff --git a/Buildings/Experimental/DHC/Loads/package.order b/Buildings/DHC/Loads/package.order
similarity index 100%
rename from Buildings/Experimental/DHC/Loads/package.order
rename to Buildings/DHC/Loads/package.order
diff --git a/Buildings/Experimental/DHC/Networks/BaseClasses/DifferenceEnthalpyFlowRate.mo b/Buildings/DHC/Networks/BaseClasses/DifferenceEnthalpyFlowRate.mo
similarity index 99%
rename from Buildings/Experimental/DHC/Networks/BaseClasses/DifferenceEnthalpyFlowRate.mo
rename to Buildings/DHC/Networks/BaseClasses/DifferenceEnthalpyFlowRate.mo
index 359730e1c10..e2a14186d12 100644
--- a/Buildings/Experimental/DHC/Networks/BaseClasses/DifferenceEnthalpyFlowRate.mo
+++ b/Buildings/DHC/Networks/BaseClasses/DifferenceEnthalpyFlowRate.mo
@@ -1,4 +1,4 @@
-within Buildings.Experimental.DHC.Networks.BaseClasses;
+within Buildings.DHC.Networks.BaseClasses;
 model DifferenceEnthalpyFlowRate
   "Sensor outputting the difference between two enthalpy flow rates"
   extends Fluid.Interfaces.PartialFourPortInterface(
diff --git a/Buildings/Experimental/DHC/Networks/BaseClasses/PartialConnection1Pipe.mo b/Buildings/DHC/Networks/BaseClasses/PartialConnection1Pipe.mo
similarity index 99%
rename from Buildings/Experimental/DHC/Networks/BaseClasses/PartialConnection1Pipe.mo
rename to Buildings/DHC/Networks/BaseClasses/PartialConnection1Pipe.mo
index cd5cffd8428..33a723555b6 100644
--- a/Buildings/Experimental/DHC/Networks/BaseClasses/PartialConnection1Pipe.mo
+++ b/Buildings/DHC/Networks/BaseClasses/PartialConnection1Pipe.mo
@@ -1,4 +1,4 @@
-within Buildings.Experimental.DHC.Networks.BaseClasses;
+within Buildings.DHC.Networks.BaseClasses;
 partial model PartialConnection1Pipe
   "Partial model for connecting an agent to a one-pipe distribution network"
   replaceable package Medium=Modelica.Media.Interfaces.PartialMedium
diff --git a/Buildings/Experimental/DHC/Networks/BaseClasses/PartialConnection2Pipe.mo b/Buildings/DHC/Networks/BaseClasses/PartialConnection2Pipe.mo
similarity index 98%
rename from Buildings/Experimental/DHC/Networks/BaseClasses/PartialConnection2Pipe.mo
rename to Buildings/DHC/Networks/BaseClasses/PartialConnection2Pipe.mo
index b56eb3d0b6e..d0b06b23544 100644
--- a/Buildings/Experimental/DHC/Networks/BaseClasses/PartialConnection2Pipe.mo
+++ b/Buildings/DHC/Networks/BaseClasses/PartialConnection2Pipe.mo
@@ -1,8 +1,8 @@
-within Buildings.Experimental.DHC.Networks.BaseClasses;
+within Buildings.DHC.Networks.BaseClasses;
 partial model PartialConnection2Pipe
   "Partial model for connecting an agent to a two-pipe distribution network"
   extends
-    Buildings.Experimental.DHC.Networks.BaseClasses.PartialConnection2Pipe2Medium(
+    Buildings.DHC.Networks.BaseClasses.PartialConnection2Pipe2Medium(
     redeclare final package MediumSup=Medium,
     redeclare final package MediumRet=Medium);
   replaceable package Medium=Modelica.Media.Interfaces.PartialMedium
diff --git a/Buildings/Experimental/DHC/Networks/BaseClasses/PartialConnection2Pipe2Medium.mo b/Buildings/DHC/Networks/BaseClasses/PartialConnection2Pipe2Medium.mo
similarity index 99%
rename from Buildings/Experimental/DHC/Networks/BaseClasses/PartialConnection2Pipe2Medium.mo
rename to Buildings/DHC/Networks/BaseClasses/PartialConnection2Pipe2Medium.mo
index 35f5ad1adb8..b87def2fcaf 100644
--- a/Buildings/Experimental/DHC/Networks/BaseClasses/PartialConnection2Pipe2Medium.mo
+++ b/Buildings/DHC/Networks/BaseClasses/PartialConnection2Pipe2Medium.mo
@@ -1,4 +1,4 @@
-within Buildings.Experimental.DHC.Networks.BaseClasses;
+within Buildings.DHC.Networks.BaseClasses;
 partial model PartialConnection2Pipe2Medium "Partial model for connecting an
   agent to a two-pipe distribution network with two medium declarations"
   replaceable package MediumSup = Modelica.Media.Interfaces.PartialMedium
diff --git a/Buildings/Experimental/DHC/Networks/BaseClasses/PartialDistribution.mo b/Buildings/DHC/Networks/BaseClasses/PartialDistribution.mo
similarity index 91%
rename from Buildings/Experimental/DHC/Networks/BaseClasses/PartialDistribution.mo
rename to Buildings/DHC/Networks/BaseClasses/PartialDistribution.mo
index fc395fa94f1..f2a29f7627a 100644
--- a/Buildings/Experimental/DHC/Networks/BaseClasses/PartialDistribution.mo
+++ b/Buildings/DHC/Networks/BaseClasses/PartialDistribution.mo
@@ -1,7 +1,7 @@
-within Buildings.Experimental.DHC.Networks.BaseClasses;
+within Buildings.DHC.Networks.BaseClasses;
 partial model PartialDistribution
   "Partial model for distribution network"
-  extends Buildings.Experimental.DHC.Networks.BaseClasses.PartialDistribution2Medium(
+  extends Buildings.DHC.Networks.BaseClasses.PartialDistribution2Medium(
     redeclare final package MediumSup=Medium,
     redeclare final package MediumRet=Medium);
   replaceable package Medium=Modelica.Media.Interfaces.PartialMedium
diff --git a/Buildings/Experimental/DHC/Networks/BaseClasses/PartialDistribution1Pipe.mo b/Buildings/DHC/Networks/BaseClasses/PartialDistribution1Pipe.mo
similarity index 99%
rename from Buildings/Experimental/DHC/Networks/BaseClasses/PartialDistribution1Pipe.mo
rename to Buildings/DHC/Networks/BaseClasses/PartialDistribution1Pipe.mo
index af3422efed5..9f4524d26cf 100644
--- a/Buildings/Experimental/DHC/Networks/BaseClasses/PartialDistribution1Pipe.mo
+++ b/Buildings/DHC/Networks/BaseClasses/PartialDistribution1Pipe.mo
@@ -1,4 +1,4 @@
-within Buildings.Experimental.DHC.Networks.BaseClasses;
+within Buildings.DHC.Networks.BaseClasses;
 partial model PartialDistribution1Pipe
   "Partial model for one-pipe distribution network"
   extends PartialDistribution;
diff --git a/Buildings/Experimental/DHC/Networks/BaseClasses/PartialDistribution2Medium.mo b/Buildings/DHC/Networks/BaseClasses/PartialDistribution2Medium.mo
similarity index 98%
rename from Buildings/Experimental/DHC/Networks/BaseClasses/PartialDistribution2Medium.mo
rename to Buildings/DHC/Networks/BaseClasses/PartialDistribution2Medium.mo
index 6ca954a5b07..fcf3e3b810a 100644
--- a/Buildings/Experimental/DHC/Networks/BaseClasses/PartialDistribution2Medium.mo
+++ b/Buildings/DHC/Networks/BaseClasses/PartialDistribution2Medium.mo
@@ -1,4 +1,4 @@
-within Buildings.Experimental.DHC.Networks.BaseClasses;
+within Buildings.DHC.Networks.BaseClasses;
 partial model PartialDistribution2Medium
   "Partial model for distribution network with two medium declarations"
   replaceable package MediumSup =
diff --git a/Buildings/Experimental/DHC/Networks/BaseClasses/PartialDistribution2Pipe.mo b/Buildings/DHC/Networks/BaseClasses/PartialDistribution2Pipe.mo
similarity index 98%
rename from Buildings/Experimental/DHC/Networks/BaseClasses/PartialDistribution2Pipe.mo
rename to Buildings/DHC/Networks/BaseClasses/PartialDistribution2Pipe.mo
index c21a52f1a8b..87184fd2562 100644
--- a/Buildings/Experimental/DHC/Networks/BaseClasses/PartialDistribution2Pipe.mo
+++ b/Buildings/DHC/Networks/BaseClasses/PartialDistribution2Pipe.mo
@@ -1,4 +1,4 @@
-within Buildings.Experimental.DHC.Networks.BaseClasses;
+within Buildings.DHC.Networks.BaseClasses;
 partial model PartialDistribution2Pipe
   "Partial model for two-pipe distribution network"
   extends PartialDistribution;
@@ -84,7 +84,7 @@ partial model PartialDistribution2Pipe
     annotation (Placement(transformation(extent={{100,40},{140,80}}),
       iconTransformation(extent={{200,30},{240,70}})));
   // COMPONENTS
-  replaceable Buildings.Experimental.DHC.Networks.BaseClasses.PartialConnection2Pipe con[nCon](
+  replaceable Buildings.DHC.Networks.BaseClasses.PartialConnection2Pipe con[nCon](
     redeclare each final package Medium=Medium,
     each final show_entFlo=show_entFlo,
     final mDis_flow_nominal=mDisCon_flow_nominal,
diff --git a/Buildings/Experimental/DHC/Networks/BaseClasses/PartialDistribution2Pipe2Medium.mo b/Buildings/DHC/Networks/BaseClasses/PartialDistribution2Pipe2Medium.mo
similarity index 95%
rename from Buildings/Experimental/DHC/Networks/BaseClasses/PartialDistribution2Pipe2Medium.mo
rename to Buildings/DHC/Networks/BaseClasses/PartialDistribution2Pipe2Medium.mo
index 6ede40196c5..aa61107f22d 100644
--- a/Buildings/Experimental/DHC/Networks/BaseClasses/PartialDistribution2Pipe2Medium.mo
+++ b/Buildings/DHC/Networks/BaseClasses/PartialDistribution2Pipe2Medium.mo
@@ -1,8 +1,8 @@
-within Buildings.Experimental.DHC.Networks.BaseClasses;
+within Buildings.DHC.Networks.BaseClasses;
 partial model PartialDistribution2Pipe2Medium
   "Partial model for a two-pipe distribution network with two medium declarations"
   extends
-    Buildings.Experimental.DHC.Networks.BaseClasses.PartialDistribution2Medium;
+    Buildings.DHC.Networks.BaseClasses.PartialDistribution2Medium;
   replaceable model Model_pipDis =
       Buildings.Fluid.Interfaces.PartialTwoPortInterface
       constrainedby Buildings.Fluid.Interfaces.PartialTwoPortInterface(
@@ -63,9 +63,9 @@ partial model PartialDistribution2Pipe2Medium
     annotation (Placement(transformation(extent={{90,-70},{110,-50}}),iconTransformation(extent={{180,-80},{220,-40}})));
   // COMPONENTS
   replaceable
-    Buildings.Experimental.DHC.Networks.BaseClasses.PartialConnection2Pipe2Medium
+    Buildings.DHC.Networks.BaseClasses.PartialConnection2Pipe2Medium
     con[nCon]
-    constrainedby Buildings.Experimental.DHC.Networks.BaseClasses.PartialConnection2Pipe2Medium(
+    constrainedby Buildings.DHC.Networks.BaseClasses.PartialConnection2Pipe2Medium(
     redeclare each final package MediumSup = MediumSup,
     redeclare each final package MediumRet = MediumRet,
     final mDis_flow_nominal=mDisCon_flow_nominal,
diff --git a/Buildings/Experimental/DHC/Networks/BaseClasses/package.mo b/Buildings/DHC/Networks/BaseClasses/package.mo
similarity index 68%
rename from Buildings/Experimental/DHC/Networks/BaseClasses/package.mo
rename to Buildings/DHC/Networks/BaseClasses/package.mo
index aff84640c17..ddbed0ebd09 100644
--- a/Buildings/Experimental/DHC/Networks/BaseClasses/package.mo
+++ b/Buildings/DHC/Networks/BaseClasses/package.mo
@@ -1,4 +1,4 @@
-within Buildings.Experimental.DHC.Networks;
+within Buildings.DHC.Networks;
 package BaseClasses "Package with base classes that are used by multiple models"
   extends Modelica.Icons.BasesPackage;
 
@@ -8,8 +8,8 @@ package BaseClasses "Package with base classes that are used by multiple models"
       info="<html>
 <p>
 This package contains base classes that are used to construct the classes in
-<a href=\"modelica://Buildings.Experimental.DHC.Networks\">
-Buildings.Experimental.DHC.Networks</a>.
+<a href=\"modelica://Buildings.DHC.Networks\">
+Buildings.DHC.Networks</a>.
 </p>
 </html>"));
 end BaseClasses;
diff --git a/Buildings/Experimental/DHC/Networks/BaseClasses/package.order b/Buildings/DHC/Networks/BaseClasses/package.order
similarity index 100%
rename from Buildings/Experimental/DHC/Networks/BaseClasses/package.order
rename to Buildings/DHC/Networks/BaseClasses/package.order
diff --git a/Buildings/Experimental/DHC/Networks/Connections/Connection1PipePlugFlow_v.mo b/Buildings/DHC/Networks/Connections/Connection1PipePlugFlow_v.mo
similarity index 95%
rename from Buildings/Experimental/DHC/Networks/Connections/Connection1PipePlugFlow_v.mo
rename to Buildings/DHC/Networks/Connections/Connection1PipePlugFlow_v.mo
index 7fbb34fe012..5ebf4ffa853 100644
--- a/Buildings/Experimental/DHC/Networks/Connections/Connection1PipePlugFlow_v.mo
+++ b/Buildings/DHC/Networks/Connections/Connection1PipePlugFlow_v.mo
@@ -1,7 +1,7 @@
-within Buildings.Experimental.DHC.Networks.Connections;
+within Buildings.DHC.Networks.Connections;
 model Connection1PipePlugFlow_v
   "Model for connecting an agent to the DHC system"
-  extends Buildings.Experimental.DHC.Networks.BaseClasses.PartialConnection1Pipe(
+  extends Buildings.DHC.Networks.BaseClasses.PartialConnection1Pipe(
     tau=5*60,
     redeclare replaceable model Model_pipDis = Buildings.Fluid.FixedResistances.PlugFlowPipe(
       final length=lDis,
diff --git a/Buildings/Experimental/DHC/Networks/Connections/Connection1Pipe_R.mo b/Buildings/DHC/Networks/Connections/Connection1Pipe_R.mo
similarity index 79%
rename from Buildings/Experimental/DHC/Networks/Connections/Connection1Pipe_R.mo
rename to Buildings/DHC/Networks/Connections/Connection1Pipe_R.mo
index 78659a2b65e..43876532727 100644
--- a/Buildings/Experimental/DHC/Networks/Connections/Connection1Pipe_R.mo
+++ b/Buildings/DHC/Networks/Connections/Connection1Pipe_R.mo
@@ -1,6 +1,6 @@
-within Buildings.Experimental.DHC.Networks.Connections;
+within Buildings.DHC.Networks.Connections;
 model Connection1Pipe_R "Model for connecting an agent to the DHC system"
-  extends Buildings.Experimental.DHC.Networks.BaseClasses.PartialConnection1Pipe(
+  extends Buildings.DHC.Networks.BaseClasses.PartialConnection1Pipe(
     tau=5*60,
     redeclare replaceable model Model_pipDis = Pipes.PipeAutosize(
         roughness = 7e-6,
@@ -38,8 +38,8 @@ First implementation.
 This model represents the supply and return lines to connect an
 agent (e.g., an energy transfer station) to a one-pipe main distribution
 system. The instances of the pipe model are autosized based on the pressure drop per pipe length
-at nominal flow rate based on the model <a href=\"modelica://Buildings.Experimental.DHC.Networks.Pipes.PipeAutosize\">
-Buildings.Experimental.DHC.Networks.Pipes.PipeAutosize</a> for the distribution line. The connection to the building as the length is typically relatively short so a losssless pipe is considered.
+at nominal flow rate based on the model <a href=\"modelica://Buildings.DHC.Networks.Pipes.PipeAutosize\">
+Buildings.DHC.Networks.Pipes.PipeAutosize</a> for the distribution line. The connection to the building as the length is typically relatively short so a losssless pipe is considered.
 </p>
 </html>"));
 end Connection1Pipe_R;
diff --git a/Buildings/Experimental/DHC/Networks/Connections/Connection2PipePlugFlow_v.mo b/Buildings/DHC/Networks/Connections/Connection2PipePlugFlow_v.mo
similarity index 96%
rename from Buildings/Experimental/DHC/Networks/Connections/Connection2PipePlugFlow_v.mo
rename to Buildings/DHC/Networks/Connections/Connection2PipePlugFlow_v.mo
index 326d2756dc6..4132fa02fd6 100644
--- a/Buildings/Experimental/DHC/Networks/Connections/Connection2PipePlugFlow_v.mo
+++ b/Buildings/DHC/Networks/Connections/Connection2PipePlugFlow_v.mo
@@ -1,7 +1,7 @@
-within Buildings.Experimental.DHC.Networks.Connections;
+within Buildings.DHC.Networks.Connections;
 model Connection2PipePlugFlow_v
   "Model for connecting an agent to a two-pipe distribution network, using plug flow pipe models in the main line"
-  extends Buildings.Experimental.DHC.Networks.BaseClasses.PartialConnection2Pipe(
+  extends Buildings.DHC.Networks.BaseClasses.PartialConnection2Pipe(
     redeclare model Model_pipDisSup = Buildings.Fluid.FixedResistances.PlugFlowPipe(
       final length = lDis,
       final dIns = dIns,
diff --git a/Buildings/Experimental/DHC/Networks/Connections/Connection2Pipe_R.mo b/Buildings/DHC/Networks/Connections/Connection2Pipe_R.mo
similarity index 82%
rename from Buildings/Experimental/DHC/Networks/Connections/Connection2Pipe_R.mo
rename to Buildings/DHC/Networks/Connections/Connection2Pipe_R.mo
index e8dae112605..b5c58dbf392 100644
--- a/Buildings/Experimental/DHC/Networks/Connections/Connection2Pipe_R.mo
+++ b/Buildings/DHC/Networks/Connections/Connection2Pipe_R.mo
@@ -1,7 +1,7 @@
-within Buildings.Experimental.DHC.Networks.Connections;
+within Buildings.DHC.Networks.Connections;
 model Connection2Pipe_R
   "Model for connecting an agent to the DHC system"
-  extends Buildings.Experimental.DHC.Networks.BaseClasses.PartialConnection2Pipe(
+  extends Buildings.DHC.Networks.BaseClasses.PartialConnection2Pipe(
     tau=5*60,
     redeclare replaceable model Model_pipDisSup = Pipes.PipeAutosize(
         roughness = 7e-6,
@@ -47,8 +47,8 @@ First implementation.
 This model represents the supply and return lines to connect an
 agent (e.g., an energy transfer station) to a two-pipe main distribution
 system. The instances of the pipe model are autosized based on the pressure drop per pipe length
-at nominal flow rate based on the model <a href=\"modelica://Buildings.Experimental.DHC.Networks.Pipes.PipeAutosize\">
-Buildings.Experimental.DHC.Networks.Pipes.PipeAutosize</a> for the distribution line. The connection to the building as the length is typically relatively short so a losssless pipe is considered.
+at nominal flow rate based on the model <a href=\"modelica://Buildings.DHC.Networks.Pipes.PipeAutosize\">
+Buildings.DHC.Networks.Pipes.PipeAutosize</a> for the distribution line. The connection to the building as the length is typically relatively short so a losssless pipe is considered.
 </p>
 </html>"));
 end Connection2Pipe_R;
diff --git a/Buildings/Experimental/DHC/Networks/Connections/Examples/Connection1PipeExample.mo b/Buildings/DHC/Networks/Connections/Examples/Connection1PipeExample.mo
similarity index 83%
rename from Buildings/Experimental/DHC/Networks/Connections/Examples/Connection1PipeExample.mo
rename to Buildings/DHC/Networks/Connections/Examples/Connection1PipeExample.mo
index 877fd804f9d..c99964f2068 100644
--- a/Buildings/Experimental/DHC/Networks/Connections/Examples/Connection1PipeExample.mo
+++ b/Buildings/DHC/Networks/Connections/Examples/Connection1PipeExample.mo
@@ -1,4 +1,4 @@
-within Buildings.Experimental.DHC.Networks.Connections.Examples;
+within Buildings.DHC.Networks.Connections.Examples;
 model Connection1PipeExample
   "Example model that showcases Connection1Pipe_R and Connection1PipePlugFlow_v models"
   extends Modelica.Icons.Example;
@@ -13,7 +13,7 @@ model Connection1PipeExample
     "Nominal mass flow rate in the connection line";
   parameter Modelica.Units.SI.Length lDis = 100
     "Length of the distribution pipe before the connection";
-  Buildings.Experimental.DHC.Networks.Connections.Connection1Pipe_R connection1Pipe_R(
+  Buildings.DHC.Networks.Connections.Connection1Pipe_R connection1Pipe_R(
     redeclare package Medium = MediumW,
     mDis_flow_nominal=mDis_flow_nominal,
     mCon_flow_nominal=mCon_flow_nominal,
@@ -25,7 +25,7 @@ model Connection1PipeExample
     nPorts=1) annotation (Placement(transformation(extent={{-20,0},{0,20}})));
   Modelica.Blocks.Sources.Constant mDis_flow_nominal_exp(k=mDis_flow_nominal)
     annotation (Placement(transformation(extent={{-80,20},{-60,40}})));
-  Buildings.Experimental.DHC.EnergyTransferStations.BaseClasses.Pump_m_flow pumDisPipe_R(
+  Buildings.DHC.ETS.BaseClasses.Pump_m_flow pumDisPipe_R(
     dp_nominal=100000,
     redeclare final package Medium = MediumW,
     m_flow_nominal=mDis_flow_nominal) "Distribution network pump" annotation (
@@ -34,7 +34,7 @@ model Connection1PipeExample
         rotation=180,
         origin={32,16})));
 
-  Buildings.Experimental.DHC.EnergyTransferStations.BaseClasses.Pump_m_flow pumConPipe_R(
+  Buildings.DHC.ETS.BaseClasses.Pump_m_flow pumConPipe_R(
     dp_nominal=5000,
     redeclare final package Medium = MediumW,
     m_flow_nominal=mDis_flow_nominal) "Agent connection pump" annotation (
@@ -42,7 +42,7 @@ model Connection1PipeExample
         extent={{10,10},{-10,-10}},
         rotation=180,
         origin={30,80})));
-  Buildings.Experimental.DHC.Networks.Connections.Connection1PipePlugFlow_v
+  Buildings.DHC.Networks.Connections.Connection1PipePlugFlow_v
     connection1PipeplugFlow(
     redeclare package Medium = MediumW,
     mDis_flow_nominal=mDis_flow_nominal,
@@ -56,7 +56,7 @@ model Connection1PipeExample
     p=300000,
     nPorts=1)
     annotation (Placement(transformation(extent={{-20,-90},{0,-70}})));
-  Buildings.Experimental.DHC.EnergyTransferStations.BaseClasses.Pump_m_flow pumDisPlugFlow(
+  Buildings.DHC.ETS.BaseClasses.Pump_m_flow pumDisPlugFlow(
     dp_nominal=100000,
     redeclare final package Medium = MediumW,
     m_flow_nominal = mDis_flow_nominal) "Distribution network pump" annotation (
@@ -64,7 +64,7 @@ model Connection1PipeExample
         extent={{-10,10},{10,-10}},
         rotation=180,
         origin={32,-80})));
-  Buildings.Experimental.DHC.EnergyTransferStations.BaseClasses.Pump_m_flow pumConPlugFlow(
+  Buildings.DHC.ETS.BaseClasses.Pump_m_flow pumConPlugFlow(
     dp_nominal=5000,
     redeclare final package Medium = MediumW,
     m_flow_nominal=mDis_flow_nominal) "Agent connection pump" annotation (
@@ -120,17 +120,17 @@ equation
         points={{30,-8},{30,-4},{60,-4},{60,98},{30,98},{30,92}}, color={0,0,
           127}));
   annotation (__Dymola_Commands(
-      file="modelica://Buildings/Resources/Scripts/Dymola/Experimental/DHC/Networks/Connections/Examples/Connection1PipeExample.mos" "Simulate and plot"),
+      file="modelica://Buildings/Resources/Scripts/Dymola/DHC/Networks/Connections/Examples/Connection1PipeExample.mos" "Simulate and plot"),
     experiment(
       StopTime=3600,
       Tolerance=1e-06),
     Documentation(info="<html>
 <p>
 Example model of two one-pipe connection models that could be used i.e for building a reservoir network to connect one agent in series.  It uses 
-<a href=\"modelica://Buildings.Experimental.DHC.Networks.Connections.Connection1Pipe_R\">
-Buildings.Experimental.DHC.Networks.Connections.Connection1Pipe_R</a> and 
-<a href=\"modelica://Buildings.Experimental.DHC.Networks.Connections.Connection1PipePlugFlow_v\">
-Buildings.Experimental.DHC.Networks.Connections.Connection1PipePlugFlow_v</a>. The agent, in this example just a pump, will draw water from the distribution pipe and release it to the same pipe.
+<a href=\"modelica://Buildings.DHC.Networks.Connections.Connection1Pipe_R\">
+Buildings.DHC.Networks.Connections.Connection1Pipe_R</a> and 
+<a href=\"modelica://Buildings.DHC.Networks.Connections.Connection1PipePlugFlow_v\">
+Buildings.DHC.Networks.Connections.Connection1PipePlugFlow_v</a>. The agent, in this example just a pump, will draw water from the distribution pipe and release it to the same pipe.
 </p>
 </html>", revisions="<html>
 <ul>
diff --git a/Buildings/Experimental/DHC/Networks/Connections/Examples/Connection2PipeExample.mo b/Buildings/DHC/Networks/Connections/Examples/Connection2PipeExample.mo
similarity index 86%
rename from Buildings/Experimental/DHC/Networks/Connections/Examples/Connection2PipeExample.mo
rename to Buildings/DHC/Networks/Connections/Examples/Connection2PipeExample.mo
index 70e395fb9c0..a0e6b303a51 100644
--- a/Buildings/Experimental/DHC/Networks/Connections/Examples/Connection2PipeExample.mo
+++ b/Buildings/DHC/Networks/Connections/Examples/Connection2PipeExample.mo
@@ -1,4 +1,4 @@
-within Buildings.Experimental.DHC.Networks.Connections.Examples;
+within Buildings.DHC.Networks.Connections.Examples;
 model Connection2PipeExample
   "Example model that showcases Connection2Pipe_R and Connection2PipePlugFlow_v models"
   extends Modelica.Icons.Example;
@@ -17,7 +17,7 @@ model Connection2PipeExample
     "Nominal mass flow rate in the connection line";
   parameter Modelica.Units.SI.Length lDis=100
     "Length of the distribution pipe before the connection";
-  Buildings.Experimental.DHC.Networks.Connections.Connection2Pipe_R connection2Pipe_R(
+  Buildings.DHC.Networks.Connections.Connection2Pipe_R connection2Pipe_R(
     redeclare package Medium = MediumW,
     mDis_flow_nominal=mDis_flow_nominal,
     mCon_flow_nominal=mCon_flow_nominal,
@@ -31,7 +31,7 @@ model Connection2PipeExample
     nPorts=1) annotation (Placement(transformation(extent={{-50,10},{-30,30}})));
   Modelica.Blocks.Sources.Constant mDis_flow_nominal_exp(k=mDis_flow_nominal)
     annotation (Placement(transformation(extent={{-80,30},{-60,50}})));
-  Buildings.Experimental.DHC.EnergyTransferStations.BaseClasses.Pump_m_flow pumDisPipe_R(
+  Buildings.DHC.ETS.BaseClasses.Pump_m_flow pumDisPipe_R(
     dp_nominal=100000,
     redeclare final package Medium = MediumW,
     m_flow_nominal=mDis_flow_nominal) "Distribution network pump" annotation (
@@ -40,7 +40,7 @@ model Connection2PipeExample
         rotation=180,
         origin={-10,20})));
 
-  Buildings.Experimental.DHC.EnergyTransferStations.BaseClasses.Pump_m_flow pumConPipe_R(
+  Buildings.DHC.ETS.BaseClasses.Pump_m_flow pumConPipe_R(
     dp_nominal=5000,
     redeclare final package Medium = MediumW,
     m_flow_nominal=mDis_flow_nominal) "Agent connection pump" annotation (
@@ -48,7 +48,7 @@ model Connection2PipeExample
         extent={{10,10},{-10,-10}},
         rotation=180,
         origin={30,82})));
-  Buildings.Experimental.DHC.Networks.Connections.Connection2PipePlugFlow_v
+  Buildings.DHC.Networks.Connections.Connection2PipePlugFlow_v
     connection2PipeplugFlow(
     redeclare package Medium = MediumW,
     mDis_flow_nominal=mDis_flow_nominal,
@@ -62,7 +62,7 @@ model Connection2PipeExample
     p=300000,
     nPorts=1)
     annotation (Placement(transformation(extent={{-60,-90},{-40,-70}})));
-  Buildings.Experimental.DHC.EnergyTransferStations.BaseClasses.Pump_m_flow pumDisPlugFlow(
+  Buildings.DHC.ETS.BaseClasses.Pump_m_flow pumDisPlugFlow(
     dp_nominal=100000,
     redeclare final package Medium = MediumW,
     m_flow_nominal=mDis_flow_nominal) "Distribution network pump" annotation (
@@ -70,7 +70,7 @@ model Connection2PipeExample
         extent={{-10,10},{10,-10}},
         rotation=180,
         origin={-12,-80})));
-  Buildings.Experimental.DHC.EnergyTransferStations.BaseClasses.Pump_m_flow pumConPlugFlow(
+  Buildings.DHC.ETS.BaseClasses.Pump_m_flow pumConPlugFlow(
     dp_nominal=5000,
     redeclare final package Medium = MediumW,
     m_flow_nominal=mDis_flow_nominal) "Agent connection pump" annotation (
@@ -153,17 +153,17 @@ equation
   connect(bouDisPipe_R.ports[1], connection2Pipe_R.port_aDisSup) annotation (
       Line(points={{-30,20},{-24,20},{-24,50},{20,50}}, color={0,127,255}));
   annotation (__Dymola_Commands(
-      file="modelica://Buildings/Resources/Scripts/Dymola/Experimental/DHC/Networks/Connections/Examples/Connection2PipeExample.mos" "Simulate and plot"),
+      file="modelica://Buildings/Resources/Scripts/Dymola/DHC/Networks/Connections/Examples/Connection2PipeExample.mos" "Simulate and plot"),
     experiment(
       StopTime=3600,
       Tolerance=1e-06),
     Documentation(info="<html>
 <p>
 Example model of two two-pipe connection models that could be used i.e for building a bi-directional network to connect one agent in series.  It uses 
-<a href=\"modelica://Buildings.Experimental.DHC.Networks.Connections.Connection2Pipe_R\">
-Buildings.Experimental.DHC.Networks.Connections.Connection2Pipe_R</a> and 
-<a href=\"modelica://Buildings.Experimental.DHC.Networks.Connections.Connection2PipePlugFlow_v\">
-Buildings.Experimental.DHC.Networks.Connections.Connection2PipePlugFlow_v</a>. The agent, in this example just a pump, will draw water from the distribution supply pipe and release it in the return pipe.
+<a href=\"modelica://Buildings.DHC.Networks.Connections.Connection2Pipe_R\">
+Buildings.DHC.Networks.Connections.Connection2Pipe_R</a> and 
+<a href=\"modelica://Buildings.DHC.Networks.Connections.Connection2PipePlugFlow_v\">
+Buildings.DHC.Networks.Connections.Connection2PipePlugFlow_v</a>. The agent, in this example just a pump, will draw water from the distribution supply pipe and release it in the return pipe.
 </p>
 </html>", revisions="<html>
 <ul>
diff --git a/Buildings/Experimental/DHC/Loads/Combined/Examples/package.mo b/Buildings/DHC/Networks/Connections/Examples/package.mo
similarity index 59%
rename from Buildings/Experimental/DHC/Loads/Combined/Examples/package.mo
rename to Buildings/DHC/Networks/Connections/Examples/package.mo
index e489cac1422..0323c15dd0a 100644
--- a/Buildings/Experimental/DHC/Loads/Combined/Examples/package.mo
+++ b/Buildings/DHC/Networks/Connections/Examples/package.mo
@@ -1,11 +1,11 @@
-within Buildings.Experimental.DHC.Loads.Combined;
+within Buildings.DHC.Networks.Connections;
 package Examples "This package contains example models"
   extends Modelica.Icons.ExamplesPackage;
   annotation (Documentation(info="<html>
 <p>
 This package contains an example illustrating the use of the model in
-<a href=\"modelica://Buildings.Experimental.DHC.Loads.Combined\">
-Buildings.Experimental.DHC.Loads.Combined</a>.
+<a href=\"modelica://Buildings.DHC.Loads.Combined\">
+Buildings.DHC.Loads.Combined</a>.
 </p>
 </html>"));
 end Examples;
diff --git a/Buildings/Experimental/DHC/Networks/Connections/Examples/package.order b/Buildings/DHC/Networks/Connections/Examples/package.order
similarity index 100%
rename from Buildings/Experimental/DHC/Networks/Connections/Examples/package.order
rename to Buildings/DHC/Networks/Connections/Examples/package.order
diff --git a/Buildings/Experimental/DHC/Networks/Connections/package.mo b/Buildings/DHC/Networks/Connections/package.mo
similarity index 89%
rename from Buildings/Experimental/DHC/Networks/Connections/package.mo
rename to Buildings/DHC/Networks/Connections/package.mo
index 20101f47abb..bdb6a2ce169 100644
--- a/Buildings/Experimental/DHC/Networks/Connections/package.mo
+++ b/Buildings/DHC/Networks/Connections/package.mo
@@ -1,4 +1,4 @@
-within Buildings.Experimental.DHC.Networks;
+within Buildings.DHC.Networks;
 package Connections "Package containing various configurations for connecting network participants to a distribution network"
   extends Modelica.Icons.VariantsPackage;
   annotation (Documentation(info="<html>
diff --git a/Buildings/Experimental/DHC/Networks/Connections/package.order b/Buildings/DHC/Networks/Connections/package.order
similarity index 100%
rename from Buildings/Experimental/DHC/Networks/Connections/package.order
rename to Buildings/DHC/Networks/Connections/package.order
diff --git a/Buildings/Experimental/DHC/Networks/Controls/AgentPump1Pipe.mo b/Buildings/DHC/Networks/Controls/AgentPump1Pipe.mo
similarity index 99%
rename from Buildings/Experimental/DHC/Networks/Controls/AgentPump1Pipe.mo
rename to Buildings/DHC/Networks/Controls/AgentPump1Pipe.mo
index 56b23f6b73f..b7808b77a7e 100644
--- a/Buildings/Experimental/DHC/Networks/Controls/AgentPump1Pipe.mo
+++ b/Buildings/DHC/Networks/Controls/AgentPump1Pipe.mo
@@ -1,4 +1,4 @@
-within Buildings.Experimental.DHC.Networks.Controls;
+within Buildings.DHC.Networks.Controls;
 block AgentPump1Pipe
   "Ambient network storage and plants agent pump control, developed for reservoir network"
    parameter Buildings.Controls.OBC.CDL.Types.SimpleController controllerType =
diff --git a/Buildings/Experimental/DHC/Networks/Controls/Examples/AgentPump1PipeExample.mo b/Buildings/DHC/Networks/Controls/Examples/AgentPump1PipeExample.mo
similarity index 84%
rename from Buildings/Experimental/DHC/Networks/Controls/Examples/AgentPump1PipeExample.mo
rename to Buildings/DHC/Networks/Controls/Examples/AgentPump1PipeExample.mo
index 05890a1b754..356f9117428 100644
--- a/Buildings/Experimental/DHC/Networks/Controls/Examples/AgentPump1PipeExample.mo
+++ b/Buildings/DHC/Networks/Controls/Examples/AgentPump1PipeExample.mo
@@ -1,4 +1,4 @@
-within Buildings.Experimental.DHC.Networks.Controls.Examples;
+within Buildings.DHC.Networks.Controls.Examples;
 model AgentPump1PipeExample
     extends Modelica.Icons.Example;
     parameter Modelica.Units.SI.Temperature TSou(displayUnit="degC") = 283.15
@@ -7,7 +7,7 @@ model AgentPump1PipeExample
   table=[0,TSou; 900,TSou + 3; 2700, TSou - 3; 3600,TSou],
   extrapolation=Modelica.Blocks.Types.Extrapolation.Periodic)
     annotation (Placement(transformation(extent={{-80,58},{-60,78}})));
-  Buildings.Experimental.DHC.Networks.Controls.AgentPump1Pipe AgentPump(
+  Buildings.DHC.Networks.Controls.AgentPump1Pipe AgentPump(
     yPumMin=0,
     dToff=0.5,
     k=1,
@@ -40,7 +40,7 @@ equation
                                    color={0,0,127}));
   annotation (Icon(coordinateSystem(preserveAspectRatio=false)), Diagram(
         coordinateSystem(preserveAspectRatio=false)),
-    __Dymola_Commands(file="modelica://Buildings/Resources/Scripts/Dymola/Experimental/DHC/Networks/Controls/Examples/AgentPump1PipeExample.mos"
+    __Dymola_Commands(file="modelica://Buildings/Resources/Scripts/Dymola/DHC/Networks/Controls/Examples/AgentPump1PipeExample.mos"
     "Simulate and plot"),
     experiment(StopTime=3600,Tolerance=1e-06),
     Documentation(revisions="<html>
@@ -53,8 +53,8 @@ First implementation.
 </html>", info="<html>
 <p>
 This model is used to test the controller
-<a href=\"modelica://Buildings.Experimental.DHC.Networks.Controls.AgentPump1Pipe\">Buildings.Experimental.DHC.Networks.Controls.AgentPump</a>.
-For a practical application of the model check <a href=\"modelica://Buildings.Experimental.DHC.Examples.Combined.SeriesVariableFlowAgentControl\">Buildings.Experimental.DHC.Examples.Combined.SeriesVariableFlowUpdate</a>.
+<a href=\"modelica://Buildings.DHC.Networks.Controls.AgentPump1Pipe\">Buildings.DHC.Networks.Controls.AgentPump</a>.
+For a practical application of the model check <a href=\"modelica://Buildings.DHC.Examples.Combined.SeriesVariableFlowAgentControl\">Buildings.DHC.Examples.Combined.SeriesVariableFlowUpdate</a>.
 </p>
 </html>"));
 end AgentPump1PipeExample;
diff --git a/Buildings/Experimental/DHC/Networks/Controls/Examples/MainPump1PipeExample.mo b/Buildings/DHC/Networks/Controls/Examples/MainPump1PipeExample.mo
similarity index 80%
rename from Buildings/Experimental/DHC/Networks/Controls/Examples/MainPump1PipeExample.mo
rename to Buildings/DHC/Networks/Controls/Examples/MainPump1PipeExample.mo
index f89d8d2caee..dc8758b428e 100644
--- a/Buildings/Experimental/DHC/Networks/Controls/Examples/MainPump1PipeExample.mo
+++ b/Buildings/DHC/Networks/Controls/Examples/MainPump1PipeExample.mo
@@ -1,4 +1,4 @@
-within Buildings.Experimental.DHC.Networks.Controls.Examples;
+within Buildings.DHC.Networks.Controls.Examples;
 model MainPump1PipeExample
     extends Modelica.Icons.Example;
     parameter Modelica.Units.SI.Temperature TSou(displayUnit="degC") = 284.65
@@ -11,7 +11,7 @@ model MainPump1PipeExample
   table=[0,TSou; 900,TSou + 4; 2700,TSou - 4; 3600,TSou],
   extrapolation=Modelica.Blocks.Types.Extrapolation.Periodic)
     annotation (Placement(transformation(extent={{-80,0},{-60,20}})));
-  MainPump1Pipe conPum(
+  Buildings.DHC.Networks.Controls.MainPump1Pipe conPum(
     nMix=1,
     nSou=1,
     nBui=1,
@@ -34,7 +34,7 @@ equation
                               color={0,0,127}));
   annotation (Icon(coordinateSystem(preserveAspectRatio=false)), Diagram(
         coordinateSystem(preserveAspectRatio=false)),
-    __Dymola_Commands(file="modelica://Buildings/Resources/Scripts/Dymola/Experimental/DHC/Networks/Controls/Examples/MainPump1PipeExample.mos"
+    __Dymola_Commands(file="modelica://Buildings/Resources/Scripts/Dymola/DHC/Networks/Controls/Examples/MainPump1PipeExample.mos"
   "Simulate and plot"),
     experiment(StopTime=3600,Tolerance=1e-06),
     Documentation(revisions="<html>
@@ -47,7 +47,7 @@ First implementation.
 </html>", info="<html>
 <p>
 This model is used to test the controller
-<a href=\"modelica://Buildings.Experimental.DHC.Networks.Controls.MainPump1Pipe\">Buildings.Experimental.DHC.Networks.Controls.MainPump1Pipe</a>.For a practical application of the model check <a href=\"modelica://Buildings.Experimental.DHC.Examples.Combined.SeriesVariableFlow\">Buildings.Experimental.DHC.Examples.Combined.SeriesVariableFlow</a>.
+<a href=\"modelica://Buildings.DHC.Networks.Controls.MainPump1Pipe\">Buildings.DHC.Networks.Controls.MainPump1Pipe</a>.For a practical application of the model check <a href=\"modelica://Buildings.DHC.Examples.Combined.SeriesVariableFlow\">Buildings.DHC.Examples.Combined.SeriesVariableFlow</a>.
 </p>
 </html>"));
 end MainPump1PipeExample;
diff --git a/Buildings/Experimental/DHC/Networks/Controls/Examples/package.mo b/Buildings/DHC/Networks/Controls/Examples/package.mo
similarity index 67%
rename from Buildings/Experimental/DHC/Networks/Controls/Examples/package.mo
rename to Buildings/DHC/Networks/Controls/Examples/package.mo
index 01be2289a54..ee876d8fd64 100644
--- a/Buildings/Experimental/DHC/Networks/Controls/Examples/package.mo
+++ b/Buildings/DHC/Networks/Controls/Examples/package.mo
@@ -1,4 +1,4 @@
-within Buildings.Experimental.DHC.Networks.Controls;
+within Buildings.DHC.Networks.Controls;
 package Examples "District controller example models"
   extends Modelica.Icons.ExamplesPackage;
 end Examples;
diff --git a/Buildings/Experimental/DHC/Networks/Controls/Examples/package.order b/Buildings/DHC/Networks/Controls/Examples/package.order
similarity index 100%
rename from Buildings/Experimental/DHC/Networks/Controls/Examples/package.order
rename to Buildings/DHC/Networks/Controls/Examples/package.order
diff --git a/Buildings/Experimental/DHC/Networks/Controls/MainPump1Pipe.mo b/Buildings/DHC/Networks/Controls/MainPump1Pipe.mo
similarity index 98%
rename from Buildings/Experimental/DHC/Networks/Controls/MainPump1Pipe.mo
rename to Buildings/DHC/Networks/Controls/MainPump1Pipe.mo
index 6f24b7cc0f0..64b92d74467 100644
--- a/Buildings/Experimental/DHC/Networks/Controls/MainPump1Pipe.mo
+++ b/Buildings/DHC/Networks/Controls/MainPump1Pipe.mo
@@ -1,4 +1,4 @@
-within Buildings.Experimental.DHC.Networks.Controls;
+within Buildings.DHC.Networks.Controls;
 model MainPump1Pipe
   "Main pump controller for 1 pipe networks, developed for reservoir network main circulation loop"
   parameter Integer nMix(min=1) "Number of mixing points after the substations";
@@ -349,7 +349,7 @@ Therefore, the pump speeds are calculated as shown in the figure below.
 <p>
 <br/>
 <img alt=\"Image of the control that adjusts the pump speed\"
-src=\"modelica://Buildings/Resources/Images/Experimental/DHC/Networks/Controls/MainPump.png\"/>
+src=\"modelica://Buildings/Resources/Images/DHC/Networks/Controls/MainPump.png\"/>
 <br/>
 </p>
 <p>
@@ -377,8 +377,8 @@ by checking that the cooling demand for each energy transfer station via
 </p>
 <p>
 For a typical usage of this controller, see
-<a href=\"modelica://Buildings.Experimental.DHC.Examples.Combined.SeriesVariableFlow\">
-Buildings.Experimental.DHC.Examples.Combined.SeriesVariableFlow</a>.
+<a href=\"modelica://Buildings.DHC.Examples.Combined.SeriesVariableFlow\">
+Buildings.DHC.Examples.Combined.SeriesVariableFlow</a>.
 </p>
 </html>"));
 end MainPump1Pipe;
diff --git a/Buildings/Experimental/DHC/Networks/Controls/package.mo b/Buildings/DHC/Networks/Controls/package.mo
similarity index 96%
rename from Buildings/Experimental/DHC/Networks/Controls/package.mo
rename to Buildings/DHC/Networks/Controls/package.mo
index 44ba6f0bc04..3479d034cf5 100644
--- a/Buildings/Experimental/DHC/Networks/Controls/package.mo
+++ b/Buildings/DHC/Networks/Controls/package.mo
@@ -1,4 +1,4 @@
-within Buildings.Experimental.DHC.Networks;
+within Buildings.DHC.Networks;
 package Controls "Package of control blocks for distribution systems"
 
   annotation (
diff --git a/Buildings/Experimental/DHC/Networks/Controls/package.order b/Buildings/DHC/Networks/Controls/package.order
similarity index 100%
rename from Buildings/Experimental/DHC/Networks/Controls/package.order
rename to Buildings/DHC/Networks/Controls/package.order
diff --git a/Buildings/Experimental/DHC/Networks/Distribution1PipePlugFlow_v.mo b/Buildings/DHC/Networks/Distribution1PipePlugFlow_v.mo
similarity index 88%
rename from Buildings/Experimental/DHC/Networks/Distribution1PipePlugFlow_v.mo
rename to Buildings/DHC/Networks/Distribution1PipePlugFlow_v.mo
index af7b2125bc5..fbadda34687 100644
--- a/Buildings/Experimental/DHC/Networks/Distribution1PipePlugFlow_v.mo
+++ b/Buildings/DHC/Networks/Distribution1PipePlugFlow_v.mo
@@ -1,9 +1,9 @@
-within Buildings.Experimental.DHC.Networks;
+within Buildings.DHC.Networks;
 model Distribution1PipePlugFlow_v
   "Model of a one-pipe distribution network with plug flow pipes in the main line with hydraulic diameter calculated from nominal velocity"
-  extends Buildings.Experimental.DHC.Networks.BaseClasses.PartialDistribution1Pipe(
+  extends Buildings.DHC.Networks.BaseClasses.PartialDistribution1Pipe(
     tau=5*60,
-    redeclare Buildings.Experimental.DHC.Networks.Connections.Connection1PipePlugFlow_v
+    redeclare Buildings.DHC.Networks.Connections.Connection1PipePlugFlow_v
       con[nCon](
       each final dIns=dIns,
       each final kIns=kIns,
@@ -58,8 +58,8 @@ equation
 <p>
 This model represents a one-pipe distribution network using a connection model with a plug flow pipe
 model (pressure drop, heat transfer, transport delays) in the main line whose hydraulic diameters
-are calculated based on nominal velocity at nominal flow rate  <a href=\"modelica://Buildings.Experimental.DHC.Networks.Connections.Connection1PipePlugFlow_v\">
-Buildings.Experimental.DHC.Networks.Connections.Connection1PipePlugFlow</a>. The same pipe model at the end of
+are calculated based on nominal velocity at nominal flow rate  <a href=\"modelica://Buildings.DHC.Networks.Connections.Connection1PipePlugFlow_v\">
+Buildings.DHC.Networks.Connections.Connection1PipePlugFlow</a>. The same pipe model at the end of
 the distribution line (after the last connection).
 </p>
 </html>", revisions="<html>
diff --git a/Buildings/Experimental/DHC/Networks/Distribution1Pipe_R.mo b/Buildings/DHC/Networks/Distribution1Pipe_R.mo
similarity index 80%
rename from Buildings/Experimental/DHC/Networks/Distribution1Pipe_R.mo
rename to Buildings/DHC/Networks/Distribution1Pipe_R.mo
index 5fa70c35d9e..0415da03c8f 100644
--- a/Buildings/Experimental/DHC/Networks/Distribution1Pipe_R.mo
+++ b/Buildings/DHC/Networks/Distribution1Pipe_R.mo
@@ -1,14 +1,14 @@
-within Buildings.Experimental.DHC.Networks;
+within Buildings.DHC.Networks;
 model Distribution1Pipe_R
   "Model of a one-pipe distribution network with hydraulic diameter of main line pipes calculated from pressure drop per length"
-  extends Buildings.Experimental.DHC.Networks.BaseClasses.PartialDistribution1Pipe(
+  extends Buildings.DHC.Networks.BaseClasses.PartialDistribution1Pipe(
     tau=5*60,
-    redeclare Buildings.Experimental.DHC.Networks.Connections.Connection1Pipe_R
+    redeclare Buildings.DHC.Networks.Connections.Connection1Pipe_R
       con[nCon](
       each final dp_length_nominal=dp_length_nominal,
       final lDis=lDis,
       final dhDis=dhDis),
-    redeclare model Model_pipDis = Buildings.Experimental.DHC.Networks.Pipes.PipeAutosize(
+    redeclare model Model_pipDis = Buildings.DHC.Networks.Pipes.PipeAutosize(
         final dp_length_nominal=dp_length_nominal,
         final dh(fixed=true) = dhEnd,
         final length=lEnd),
@@ -34,8 +34,8 @@ model Distribution1Pipe_R
   annotation (Documentation(info="<html>
 <p>
 This is a model of a one-pipe distribution network using a connection model with pipes in the main line whose hydraulic diameters 
-are calculated at initialization based on the pressure drop per pipe length at nominal flow rate <a href=\"modelica://Buildings.Experimental.DHC.Networks.Connections.Connection1Pipe_R\">
-Buildings.Experimental.DHC.Networks.Connections.Connection1Pipe_R</a>. The same pipe model is also used
+are calculated at initialization based on the pressure drop per pipe length at nominal flow rate <a href=\"modelica://Buildings.DHC.Networks.Connections.Connection1Pipe_R\">
+Buildings.DHC.Networks.Connections.Connection1Pipe_R</a>. The same pipe model is also used
 at the end of the distribution line (after the last connection) only on the supply side.
 </p>
 <h4>Modeling considerations</h4>
@@ -43,8 +43,8 @@ at the end of the distribution line (after the last connection) only on the supp
 Note that <code>dhDis</code> needs to be vectorized, even if the same value
 is computed for each array element in case of a one-pipe network.
 This is because the pipe diameter is computed at initialization by the model
-<a href=\"modelica://Buildings.Experimental.DHC.Networks.Pipes.PipeAutosize\">
-Buildings.Experimental.DHC.Networks.Pipes.PipeAutosize</a>
+<a href=\"modelica://Buildings.DHC.Networks.Pipes.PipeAutosize\">
+Buildings.DHC.Networks.Pipes.PipeAutosize</a>
 which is instantiated for each connection.
 So the initialization system of equations would be overdetermined if using
 a parameter binding with a scalar variable.
diff --git a/Buildings/Experimental/DHC/Networks/Distribution2PipePlugFlow_v.mo b/Buildings/DHC/Networks/Distribution2PipePlugFlow_v.mo
similarity index 92%
rename from Buildings/Experimental/DHC/Networks/Distribution2PipePlugFlow_v.mo
rename to Buildings/DHC/Networks/Distribution2PipePlugFlow_v.mo
index 5af200759da..0d5eb0401ec 100644
--- a/Buildings/Experimental/DHC/Networks/Distribution2PipePlugFlow_v.mo
+++ b/Buildings/DHC/Networks/Distribution2PipePlugFlow_v.mo
@@ -1,7 +1,7 @@
-within Buildings.Experimental.DHC.Networks;
+within Buildings.DHC.Networks;
 model Distribution2PipePlugFlow_v
   "Model of a two-pipe distribution network using plug flow pipe models in the main lines with hydraulic diameter calculated from nominal velocity"
-  extends Buildings.Experimental.DHC.Networks.BaseClasses.PartialDistribution2Pipe(
+  extends Buildings.DHC.Networks.BaseClasses.PartialDistribution2Pipe(
       redeclare Connections.Connection2PipePlugFlow_v con[nCon](
       final lDis=lDis,
       each final dIns=dIns,
@@ -68,8 +68,8 @@ equation
 <p>
 This is a model of a two-pipe distribution network using a connection model with a plug flow pipe
 model (pressure drop, heat transfer, transport delays) in the main lines whose hydraulic diameters
-are calculated based on nominal velocity at nominal flow rate <a href=\"modelica://Buildings.Experimental.DHC.Networks.Connections.Connection2PipePlugFlow_v\">
-Buildings.Experimental.DHC.Networks.Connections.Connection2PipePlugFlow</a>. The same pipe model is also used
+are calculated based on nominal velocity at nominal flow rate <a href=\"modelica://Buildings.DHC.Networks.Connections.Connection2PipePlugFlow_v\">
+Buildings.DHC.Networks.Connections.Connection2PipePlugFlow</a>. The same pipe model is also used
 at the end of the distribution line (after the last connection) only on the supply side.
 </p>
 </html>",
diff --git a/Buildings/Experimental/DHC/Networks/Distribution2Pipe_R.mo b/Buildings/DHC/Networks/Distribution2Pipe_R.mo
similarity index 81%
rename from Buildings/Experimental/DHC/Networks/Distribution2Pipe_R.mo
rename to Buildings/DHC/Networks/Distribution2Pipe_R.mo
index 9aefa16c25d..01bad36994d 100644
--- a/Buildings/Experimental/DHC/Networks/Distribution2Pipe_R.mo
+++ b/Buildings/DHC/Networks/Distribution2Pipe_R.mo
@@ -1,15 +1,15 @@
-within Buildings.Experimental.DHC.Networks;
+within Buildings.DHC.Networks;
 model Distribution2Pipe_R
   "Model of a two-pipe distribution network with hydraulic diameter of main line pipes calculated from pressure drop per length"
-  extends Buildings.Experimental.DHC.Networks.BaseClasses.PartialDistribution2Pipe(
+  extends Buildings.DHC.Networks.BaseClasses.PartialDistribution2Pipe(
     tau=5*60,
-    redeclare Buildings.Experimental.DHC.Networks.Connections.Connection2Pipe_R
+    redeclare Buildings.DHC.Networks.Connections.Connection2Pipe_R
       con[nCon](
       each final dp_length_nominal=dp_length_nominal,
       final lDis=lDis,
       final dhDis=dhDis,
       final dhDisRet=dhDisRet),
-    redeclare model Model_pipDis = Buildings.Experimental.DHC.Networks.Pipes.PipeAutosize(
+    redeclare model Model_pipDis = Buildings.DHC.Networks.Pipes.PipeAutosize(
         roughness=7e-6,
         fac=1.5,
         final dp_length_nominal=dp_length_nominal,
@@ -41,8 +41,8 @@ model Distribution2Pipe_R
   annotation (Documentation(info="<html>
 <p>
 This is a model of a two-pipe distribution network using a connection model with pipes in the main lines whose hydraulic diameters 
-are calculated at initialization based on the pressure drop per pipe length at nominal flow rate <a href=\"modelica://Buildings.Experimental.DHC.Networks.Connections.Connection2Pipe_R\">
-Buildings.Experimental.DHC.Networks.Connections.Connection2Pipe_R</a>. The same pipe model is also used
+are calculated at initialization based on the pressure drop per pipe length at nominal flow rate <a href=\"modelica://Buildings.DHC.Networks.Connections.Connection2Pipe_R\">
+Buildings.DHC.Networks.Connections.Connection2Pipe_R</a>. The same pipe model is also used
 at the end of the distribution line (after the last connection) only on the supply side.
 </p>
 <h4>Modeling considerations</h4>
@@ -50,8 +50,8 @@ at the end of the distribution line (after the last connection) only on the supp
 Note that <code>dhDis</code> needs to be vectorized, even if the same value
 is computed for each array element in case of a one-pipe network.
 This is because the pipe diameter is computed at initialization by the model
-<a href=\"modelica://Buildings.Experimental.DHC.Networks.Pipes.PipeAutosize\">
-Buildings.Experimental.DHC.Networks.Pipes.PipeAutosize</a>
+<a href=\"modelica://Buildings.DHC.Networks.Pipes.PipeAutosize\">
+Buildings.DHC.Networks.Pipes.PipeAutosize</a>
 which is instantiated for each connection.
 So the initialization system of equations would be overdetermined if using
 a parameter binding with a scalar variable.
diff --git a/Buildings/Experimental/DHC/Networks/Examples/Distribution1PipeExample.mo b/Buildings/DHC/Networks/Examples/Distribution1PipeExample.mo
similarity index 88%
rename from Buildings/Experimental/DHC/Networks/Examples/Distribution1PipeExample.mo
rename to Buildings/DHC/Networks/Examples/Distribution1PipeExample.mo
index 865201ebb8f..2048b273fbe 100644
--- a/Buildings/Experimental/DHC/Networks/Examples/Distribution1PipeExample.mo
+++ b/Buildings/DHC/Networks/Examples/Distribution1PipeExample.mo
@@ -1,4 +1,4 @@
-within Buildings.Experimental.DHC.Networks.Examples;
+within Buildings.DHC.Networks.Examples;
 model Distribution1PipeExample
   "Example of distribution network with 1 pipe for Distribution1Pipe_R and Distribution1PipePlugFlow_v"
   extends Modelica.Icons.Example;
@@ -6,7 +6,7 @@ model Distribution1PipeExample
     "Source side medium";
   package Medium2 = Buildings.Media.Air
     "Load side medium";
-  parameter String filNam = "modelica://Buildings/Resources/Data/Experimental/DHC/Loads/Examples/SwissResidential_20190916.mos"
+  parameter String filNam = "modelica://Buildings/Resources/Data/DHC/Loads/Examples/SwissResidential_20190916.mos"
     "File name with thermal loads as time series";
   parameter Integer nLoa=5
     "Number of served loads"
@@ -39,11 +39,11 @@ model Distribution1PipeExample
   sum(disAutoSize.con.pipDis.dp_nominal) + max(terAutoSize.dpSou_nominal)
     "Nominal pressure drop in the distribution line";
   final parameter Modelica.Units.SI.HeatFlowRate QHea_flow_nominal =
-      Buildings.Experimental.DHC.Loads.BaseClasses.getPeakLoad(string="#Peak space heating load",
+      Buildings.DHC.Loads.BaseClasses.getPeakLoad(string="#Peak space heating load",
       filNam = Modelica.Utilities.Files.loadResource(filNam))/facMul
     "Design heating heat flow rate (>=0)"
     annotation (Dialog(group="Design parameter"));
-  Buildings.Experimental.DHC.Loads.BaseClasses.Validation.BaseClasses.FanCoil2PipeHeatingValve
+  Buildings.DHC.Loads.BaseClasses.Validation.BaseClasses.FanCoil2PipeHeatingValve
     terAutoSize[nLoa](
     each final facMul=facMul,
     redeclare each final package Medium1 = Medium1,
@@ -87,7 +87,7 @@ model Distribution1PipeExample
         extent={{-10,-10},{10,10}},
         rotation=0,
         origin={-70,10})));
-  Buildings.Experimental.DHC.Networks.Distribution1Pipe_R disAutoSize(
+  Buildings.DHC.Networks.Distribution1Pipe_R disAutoSize(
     redeclare final package Medium = Medium1,
     nCon=nLoa,
     allowFlowReversal=false,
@@ -112,7 +112,7 @@ model Distribution1PipeExample
   Buildings.Controls.OBC.CDL.Reals.Sources.Constant THeaWatSup(k=max(
         terAutoSize.T_aHeaWat_nominal)) "Supply temperature"
     annotation (Placement(transformation(extent={{-120,0},{-100,20}})));
-  Buildings.Experimental.DHC.Loads.BaseClasses.Validation.BaseClasses.FanCoil2PipeHeatingValve terPlugFlow[nLoa](
+  Buildings.DHC.Loads.BaseClasses.Validation.BaseClasses.FanCoil2PipeHeatingValve terPlugFlow[nLoa](
     each final facMul=facMul,
     redeclare each final package Medium1 = Medium1,
     redeclare each final package Medium2 = Medium2,
@@ -122,7 +122,7 @@ model Distribution1PipeExample
     each final T_bHeaWat_nominal=T_bHeaWat_nominal,
     each final T_aLoaHea_nominal=T_aLoaHea_nominal) "Heating terminal unit"
     annotation (Placement(transformation(extent={{30,-16},{50,4}})));
-  Buildings.Experimental.DHC.Networks.Distribution1PipePlugFlow_v disPlugFlow(
+  Buildings.DHC.Networks.Distribution1PipePlugFlow_v disPlugFlow(
     nCon=nLoa,
     redeclare final package Medium = Medium1,
     allowFlowReversal=false,
@@ -158,7 +158,7 @@ model Distribution1PipeExample
         extent={{-11,10},{11,-10}},
         rotation=0,
         origin={41,-100})));
-  EnergyTransferStations.BaseClasses.Pump_m_flow pumConAutoSize[nLoa](
+  Buildings.DHC.ETS.BaseClasses.Pump_m_flow pumConAutoSize[nLoa](
     each dp_nominal=5000,
     redeclare final package Medium = Medium1,
     each m_flow_nominal=mLoaHea_flow_nominal) "Distribution network pump"
@@ -172,7 +172,7 @@ model Distribution1PipeExample
   Modelica.Blocks.Sources.RealExpression mFlowConAutosize(
   y=terAutoSize[1].val.y_actual*mLoaHea_flow_nominal)
     annotation (Placement(transformation(extent={{120,50},{100,70}})));
-  EnergyTransferStations.BaseClasses.Pump_m_flow pumConPlugFlow[nLoa](
+  Buildings.DHC.ETS.BaseClasses.Pump_m_flow pumConPlugFlow[nLoa](
     each dp_nominal=5000,
     redeclare final package Medium = Medium1,
     each m_flow_nominal=mLoaHea_flow_nominal) "Distribution network pump"
@@ -263,12 +263,12 @@ equation
       info="<html>
 <p>
 Example model of two one-pipe distribution models that could be used i.e for building a reservoir network to connect several agents in series.
-It showcases <a href=\"modelica://Buildings.Experimental.DHC.Networks.Distribution1Pipe_R\">
-Buildings.Experimental.DHC.Networks.Distribution1Pipe_R</a> and <a href=\"modelica://Buildings.Experimental.DHC.Networks.Distribution1PipePlugFlow_v\">
-Buildings.Experimental.DHC.Networks.Distribution1PipePlugFlow_v</a>. The distribution models create a vector of <code>nLoa</code> connection models
-<a href=\"modelica://Buildings.Experimental.DHC.Networks.Connections\"> Buildings.Experimental.DHC.Networks.Connections</a> that are connected to a vector
-of <code>nLoa</code> agents made up by time series heating loads <a href=\"modelica://Buildings.Experimental.DHC.Loads.BaseClasses.Validation.BaseClasses.FanCoil2PipeHeatingValve\">
-Buildings.Experimental.DHC.Loads.BaseClasses.Validation.BaseClasses.FanCoil2PipeHeatingValve</a>. Each agent will draw water from the distribution pipe and release
+It showcases <a href=\"modelica://Buildings.DHC.Networks.Distribution1Pipe_R\">
+Buildings.DHC.Networks.Distribution1Pipe_R</a> and <a href=\"modelica://Buildings.DHC.Networks.Distribution1PipePlugFlow_v\">
+Buildings.DHC.Networks.Distribution1PipePlugFlow_v</a>. The distribution models create a vector of <code>nLoa</code> connection models
+<a href=\"modelica://Buildings.DHC.Networks.Connections\"> Buildings.DHC.Networks.Connections</a> that are connected to a vector
+of <code>nLoa</code> agents made up by time series heating loads <a href=\"modelica://Buildings.DHC.Loads.BaseClasses.Validation.BaseClasses.FanCoil2PipeHeatingValve\">
+Buildings.DHC.Loads.BaseClasses.Validation.BaseClasses.FanCoil2PipeHeatingValve</a>. Each agent will draw water from the distribution pipe and release
 it to the same pipe.
 </p>
 </html>",
@@ -288,5 +288,5 @@ First implementation.
         preserveAspectRatio=false,
         extent={{-120,-120},{120,120}})),
     __Dymola_Commands(
-      file="modelica://Buildings/Resources/Scripts/Dymola/Experimental/DHC/Networks/Examples/Distribution1PipeExample.mos" "Simulate and plot"));
+      file="modelica://Buildings/Resources/Scripts/Dymola/DHC/Networks/Examples/Distribution1PipeExample.mos" "Simulate and plot"));
 end Distribution1PipeExample;
diff --git a/Buildings/Experimental/DHC/Networks/Examples/Distribution2PipeExample.mo b/Buildings/DHC/Networks/Examples/Distribution2PipeExample.mo
similarity index 88%
rename from Buildings/Experimental/DHC/Networks/Examples/Distribution2PipeExample.mo
rename to Buildings/DHC/Networks/Examples/Distribution2PipeExample.mo
index 81b6cf1d4ec..e0973449a29 100644
--- a/Buildings/Experimental/DHC/Networks/Examples/Distribution2PipeExample.mo
+++ b/Buildings/DHC/Networks/Examples/Distribution2PipeExample.mo
@@ -1,4 +1,4 @@
-within Buildings.Experimental.DHC.Networks.Examples;
+within Buildings.DHC.Networks.Examples;
 model Distribution2PipeExample
   "Example of distribution network with 2 pipes for Distribution2Pipe_R and Distribution2PipePlugFlow_v"
   extends Modelica.Icons.Example;
@@ -6,7 +6,7 @@ model Distribution2PipeExample
     "Source side medium";
   package Medium2 = Buildings.Media.Air
     "Load side medium";
-  parameter String filNam = "modelica://Buildings/Resources/Data/Experimental/DHC/Loads/Examples/SwissResidential_20190916.mos"
+  parameter String filNam = "modelica://Buildings/Resources/Data/DHC/Loads/Examples/SwissResidential_20190916.mos"
     "File name with thermal loads as time series";
   parameter Integer nLoa = 5
     "Number of served loads"
@@ -41,11 +41,11 @@ model Distribution2PipeExample
        + max(terAutoSize.dpSou_nominal)
     "Nominal pressure drop in the distribution line";
   final parameter Modelica.Units.SI.HeatFlowRate QHea_flow_nominal=
-      Buildings.Experimental.DHC.Loads.BaseClasses.getPeakLoad(string="#Peak space heating load",
+      Buildings.DHC.Loads.BaseClasses.getPeakLoad(string="#Peak space heating load",
       filNam = Modelica.Utilities.Files.loadResource(filNam))/facMul
     "Design heating heat flow rate (>=0)"
     annotation (Dialog(group="Design parameter"));
-  Buildings.Experimental.DHC.Loads.BaseClasses.Validation.BaseClasses.FanCoil2PipeHeatingValve
+  Buildings.DHC.Loads.BaseClasses.Validation.BaseClasses.FanCoil2PipeHeatingValve
     terAutoSize[nLoa](
     each final facMul=facMul,
     redeclare each final package Medium1 = Medium1,
@@ -89,7 +89,7 @@ model Distribution2PipeExample
         extent={{-10,-10},{10,10}},
         rotation=0,
         origin={-50,10})));
-  Buildings.Experimental.DHC.Networks.Distribution2Pipe_R disAutoSize(
+  Buildings.DHC.Networks.Distribution2Pipe_R disAutoSize(
     redeclare final package Medium = Medium1,
     nCon=nLoa,
     allowFlowReversal=false,
@@ -115,7 +115,7 @@ model Distribution2PipeExample
   Buildings.Controls.OBC.CDL.Reals.Sources.Constant THeaWatSup(
   k=max(terAutoSize.T_aHeaWat_nominal)) "Supply temperature"
     annotation (Placement(transformation(extent={{-100,0},{-80,20}})));
-  Buildings.Experimental.DHC.Loads.BaseClasses.Validation.BaseClasses.FanCoil2PipeHeatingValve terPlugFlow[nLoa](
+  Buildings.DHC.Loads.BaseClasses.Validation.BaseClasses.FanCoil2PipeHeatingValve terPlugFlow[nLoa](
     each final facMul=facMul,
     redeclare each final package Medium1 = Medium1,
     redeclare each final package Medium2 = Medium2,
@@ -125,7 +125,7 @@ model Distribution2PipeExample
     each final T_bHeaWat_nominal=T_bHeaWat_nominal,
     each final T_aLoaHea_nominal=T_aLoaHea_nominal) "Heating terminal unit"
     annotation (Placement(transformation(extent={{50,-20},{70,0}})));
-  Buildings.Experimental.DHC.Networks.Distribution2PipePlugFlow_v disPlugFlow(
+  Buildings.DHC.Networks.Distribution2PipePlugFlow_v disPlugFlow(
     nCon=nLoa,
     redeclare final package Medium = Medium1,
     allowFlowReversal=false,
@@ -233,12 +233,12 @@ equation
       info="<html>
 <p>
 Example model of two two-pipe distribution models that can be used i.e. for building a bi-directional network to connect several agents in series.
-It showcases <a href=\"modelica://Buildings.Experimental.DHC.Networks.Distribution2Pipe_R\"> Buildings.Experimental.DHC.Networks.Distribution2Pipe_R</a>
-and <a href=\"modelica://Buildings.Experimental.DHC.Networks.Distribution2PipePlugFlow_v\"> Buildings.Experimental.DHC.Networks.Distribution2PipePlugFlow_v</a>.
- The distribution models create a vector of <code>nLoa</code> connection models <a href=\"modelica://Buildings.Experimental.DHC.Networks.Connections\">
-Buildings.Experimental.DHC.Networks.Connections</a> that are connected to a vector of <code>nLoa</code> agents made up by time series heating loads
-<a href=\"modelica://Buildings.Experimental.DHC.Loads.BaseClasses.Validation.BaseClasses.FanCoil2PipeHeatingValve\">
-Buildings.Experimental.DHC.Loads.BaseClasses.Validation.BaseClasses.FanCoil2PipeHeatingValve</a>. Each agent will draw water from the supply distribution pipe
+It showcases <a href=\"modelica://Buildings.DHC.Networks.Distribution2Pipe_R\"> Buildings.DHC.Networks.Distribution2Pipe_R</a>
+and <a href=\"modelica://Buildings.DHC.Networks.Distribution2PipePlugFlow_v\"> Buildings.DHC.Networks.Distribution2PipePlugFlow_v</a>.
+ The distribution models create a vector of <code>nLoa</code> connection models <a href=\"modelica://Buildings.DHC.Networks.Connections\">
+Buildings.DHC.Networks.Connections</a> that are connected to a vector of <code>nLoa</code> agents made up by time series heating loads
+<a href=\"modelica://Buildings.DHC.Loads.BaseClasses.Validation.BaseClasses.FanCoil2PipeHeatingValve\">
+Buildings.DHC.Loads.BaseClasses.Validation.BaseClasses.FanCoil2PipeHeatingValve</a>. Each agent will draw water from the supply distribution pipe
 and release it in the return pipe.
 </p>
 </html>",
@@ -261,5 +261,5 @@ First implementation.
         preserveAspectRatio=false,
         extent={{-120,-120},{120,120}})),
     __Dymola_Commands(
-      file="modelica://Buildings/Resources/Scripts/Dymola/Experimental/DHC/Networks/Examples/Distribution2PipeExample.mos" "Simulate and plot"));
+      file="modelica://Buildings/Resources/Scripts/Dymola/DHC/Networks/Examples/Distribution2PipeExample.mos" "Simulate and plot"));
 end Distribution2PipeExample;
diff --git a/Buildings/Experimental/DHC/Networks/Connections/Examples/package.mo b/Buildings/DHC/Networks/Examples/package.mo
similarity index 59%
rename from Buildings/Experimental/DHC/Networks/Connections/Examples/package.mo
rename to Buildings/DHC/Networks/Examples/package.mo
index 3456922179d..2cdffcc2bbb 100644
--- a/Buildings/Experimental/DHC/Networks/Connections/Examples/package.mo
+++ b/Buildings/DHC/Networks/Examples/package.mo
@@ -1,11 +1,11 @@
-within Buildings.Experimental.DHC.Networks.Connections;
+within Buildings.DHC.Networks;
 package Examples "This package contains example models"
   extends Modelica.Icons.ExamplesPackage;
   annotation (Documentation(info="<html>
 <p>
 This package contains an example illustrating the use of the model in
-<a href=\"modelica://Buildings.Experimental.DHC.Loads.Combined\">
-Buildings.Experimental.DHC.Loads.Combined</a>.
+<a href=\"modelica://Buildings.DHC.Networks\">
+Buildings.DHC.Networks</a>.
 </p>
 </html>"));
 end Examples;
diff --git a/Buildings/Experimental/DHC/Networks/Examples/package.order b/Buildings/DHC/Networks/Examples/package.order
similarity index 100%
rename from Buildings/Experimental/DHC/Networks/Examples/package.order
rename to Buildings/DHC/Networks/Examples/package.order
diff --git a/Buildings/Experimental/DHC/Networks/Pipes/PipeAutosize.mo b/Buildings/DHC/Networks/Pipes/PipeAutosize.mo
similarity index 98%
rename from Buildings/Experimental/DHC/Networks/Pipes/PipeAutosize.mo
rename to Buildings/DHC/Networks/Pipes/PipeAutosize.mo
index 5ae886627e5..a061c8fc9f3 100644
--- a/Buildings/Experimental/DHC/Networks/Pipes/PipeAutosize.mo
+++ b/Buildings/DHC/Networks/Pipes/PipeAutosize.mo
@@ -1,4 +1,4 @@
-within Buildings.Experimental.DHC.Networks.Pipes;
+within Buildings.DHC.Networks.Pipes;
 model PipeAutosize "Pipe model parameterized with pressure drop per pipe length"
   extends Buildings.Fluid.FixedResistances.PressureDrop(
     final deltaM = eta_default*dh/4*Modelica.Constants.pi*ReC/m_flow_nominal_pos,
diff --git a/Buildings/Experimental/DHC/Networks/Pipes/PipeStandard.mo b/Buildings/DHC/Networks/Pipes/PipeStandard.mo
similarity index 95%
rename from Buildings/Experimental/DHC/Networks/Pipes/PipeStandard.mo
rename to Buildings/DHC/Networks/Pipes/PipeStandard.mo
index 82a20879bbc..dcfed819bd4 100644
--- a/Buildings/Experimental/DHC/Networks/Pipes/PipeStandard.mo
+++ b/Buildings/DHC/Networks/Pipes/PipeStandard.mo
@@ -1,4 +1,4 @@
-within Buildings.Experimental.DHC.Networks.Pipes;
+within Buildings.DHC.Networks.Pipes;
 model PipeStandard "Pipe model parameterized with hydraulic diameter"
   extends Buildings.Fluid.FixedResistances.HydraulicDiameter(
     dp(nominal = 1E5),
diff --git a/Buildings/Experimental/DHC/Networks/Pipes/Validation/Pipe.mo b/Buildings/DHC/Networks/Pipes/Validation/Pipe.mo
similarity index 91%
rename from Buildings/Experimental/DHC/Networks/Pipes/Validation/Pipe.mo
rename to Buildings/DHC/Networks/Pipes/Validation/Pipe.mo
index 67e935fd4f1..97a140dada4 100644
--- a/Buildings/Experimental/DHC/Networks/Pipes/Validation/Pipe.mo
+++ b/Buildings/DHC/Networks/Pipes/Validation/Pipe.mo
@@ -1,4 +1,4 @@
-within Buildings.Experimental.DHC.Networks.Pipes.Validation;
+within Buildings.DHC.Networks.Pipes.Validation;
 model Pipe "Validates the PipeAutosize model initialization"
   extends Modelica.Icons.Example;
   package Medium = Buildings.Media.Water "Medium model";
@@ -12,7 +12,7 @@ model Pipe "Validates the PipeAutosize model initialization"
         extent={{-10,-10},{10,10}},
         rotation=180,
         origin={50,0})));
-  Buildings.Experimental.DHC.Networks.Pipes.PipeStandard pipSta1(
+  Buildings.DHC.Networks.Pipes.PipeStandard pipSta1(
     redeclare final package Medium = Medium,
     m_flow_nominal=m1_flow_nominal,
     dh=0.00548,
@@ -28,7 +28,7 @@ model Pipe "Validates the PipeAutosize model initialization"
     m_flow=m2_flow_nominal,
     nPorts=1) "Source of water flow for autosized pipe 2"
     annotation (Placement(transformation(extent={{-60,10},{-40,30}})));
-  Buildings.Experimental.DHC.Networks.Pipes.PipeAutosize pipAut2(
+  Buildings.DHC.Networks.Pipes.PipeAutosize pipAut2(
     redeclare final package Medium = Medium,
     m_flow_nominal=m2_flow_nominal,
     dp_length_nominal=dp2_length_nominal,
@@ -75,8 +75,8 @@ equation
     annotation (Line(points={{10,-60},{40,-60},{40,-1.5}}, color={0,127,255}));
   annotation (Documentation(info="<html>
 <p>
-Validation model for <a href=\"modelica://Buildings.Experimental.DHC.Networks.Pipes.PipeAutosize\">
-Buildings.Experimental.DHC.Networks.Combined.BaseClasses.PipeAutosize</a>
+Validation model for <a href=\"modelica://Buildings.DHC.Networks.Pipes.PipeAutosize\">
+Buildings.DHC.Networks.Combined.BaseClasses.PipeAutosize</a>
 for range of flow rates and pressure drops per unit length.
 </p>
 </html>", revisions="<html>
@@ -93,7 +93,7 @@ This is for <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/2510\
 </li>
 </ul>
 </html>"),
-__Dymola_Commands(file="modelica://Buildings/Resources/Scripts/Dymola/Experimental/DHC/Networks/Pipes/Validation/Pipe.mos"
+__Dymola_Commands(file="modelica://Buildings/Resources/Scripts/Dymola/DHC/Networks/Pipes/Validation/Pipe.mos"
         "Simulate and plot"),
 experiment(
       StopTime=1,
diff --git a/Buildings/Experimental/DHC/Networks/Pipes/Validation/package.mo b/Buildings/DHC/Networks/Pipes/Validation/package.mo
similarity index 61%
rename from Buildings/Experimental/DHC/Networks/Pipes/Validation/package.mo
rename to Buildings/DHC/Networks/Pipes/Validation/package.mo
index efa7a5066d0..0ecb66dec17 100644
--- a/Buildings/Experimental/DHC/Networks/Pipes/Validation/package.mo
+++ b/Buildings/DHC/Networks/Pipes/Validation/package.mo
@@ -1,12 +1,12 @@
-within Buildings.Experimental.DHC.Networks.Pipes;
+within Buildings.DHC.Networks.Pipes;
 package Validation "Validation models for Pipes"
   extends Modelica.Icons.ExamplesPackage;
 
 annotation (preferredView="info", Documentation(info="<html>
 <p>
 This package contains validation cases for the BaseClasses found in
-<a href=\"modelica://Buildings.Experimental.DHC.Networks.Pipes\">
-Buildings.Experimental.DHC.Networks.Pipes</a>.
+<a href=\"modelica://Buildings.DHC.Networks.Pipes\">
+Buildings.DHC.Networks.Pipes</a>.
 </p>
 </html>"));
 end Validation;
diff --git a/Buildings/Experimental/DHC/Networks/Pipes/Validation/package.order b/Buildings/DHC/Networks/Pipes/Validation/package.order
similarity index 100%
rename from Buildings/Experimental/DHC/Networks/Pipes/Validation/package.order
rename to Buildings/DHC/Networks/Pipes/Validation/package.order
diff --git a/Buildings/Experimental/DHC/Networks/Pipes/package.mo b/Buildings/DHC/Networks/Pipes/package.mo
similarity index 85%
rename from Buildings/Experimental/DHC/Networks/Pipes/package.mo
rename to Buildings/DHC/Networks/Pipes/package.mo
index 43c3f043c67..ecadf6ca8cc 100644
--- a/Buildings/Experimental/DHC/Networks/Pipes/package.mo
+++ b/Buildings/DHC/Networks/Pipes/package.mo
@@ -1,4 +1,4 @@
-within Buildings.Experimental.DHC.Networks;
+within Buildings.DHC.Networks;
 package Pipes "Package containing pipe models used within district network modeling"
   extends Modelica.Icons.VariantsPackage;
   annotation (Documentation(info="<html>
diff --git a/Buildings/Experimental/DHC/Networks/Pipes/package.order b/Buildings/DHC/Networks/Pipes/package.order
similarity index 100%
rename from Buildings/Experimental/DHC/Networks/Pipes/package.order
rename to Buildings/DHC/Networks/Pipes/package.order
diff --git a/Buildings/Experimental/DHC/Networks/Steam/ConnectionCondensatePipe.mo b/Buildings/DHC/Networks/Steam/ConnectionCondensatePipe.mo
similarity index 96%
rename from Buildings/Experimental/DHC/Networks/Steam/ConnectionCondensatePipe.mo
rename to Buildings/DHC/Networks/Steam/ConnectionCondensatePipe.mo
index ff501e55fb7..1d39c395729 100644
--- a/Buildings/Experimental/DHC/Networks/Steam/ConnectionCondensatePipe.mo
+++ b/Buildings/DHC/Networks/Steam/ConnectionCondensatePipe.mo
@@ -1,8 +1,8 @@
-within Buildings.Experimental.DHC.Networks.Steam;
+within Buildings.DHC.Networks.Steam;
 model ConnectionCondensatePipe
   "Connection for a steam district heating network featuring the condensate return pipe"
   extends
-    Buildings.Experimental.DHC.Networks.BaseClasses.PartialConnection2Pipe2Medium(
+    Buildings.DHC.Networks.BaseClasses.PartialConnection2Pipe2Medium(
     redeclare final model Model_pipDisRet =
         Buildings.Fluid.FixedResistances.PressureDrop (
           final dp_nominal=dp_nominal),
diff --git a/Buildings/Experimental/DHC/Networks/Steam/DistributionCondensatePipe.mo b/Buildings/DHC/Networks/Steam/DistributionCondensatePipe.mo
similarity index 94%
rename from Buildings/Experimental/DHC/Networks/Steam/DistributionCondensatePipe.mo
rename to Buildings/DHC/Networks/Steam/DistributionCondensatePipe.mo
index 2881c216db0..9a1160bae1e 100644
--- a/Buildings/Experimental/DHC/Networks/Steam/DistributionCondensatePipe.mo
+++ b/Buildings/DHC/Networks/Steam/DistributionCondensatePipe.mo
@@ -1,7 +1,7 @@
-within Buildings.Experimental.DHC.Networks.Steam;
+within Buildings.DHC.Networks.Steam;
 model DistributionCondensatePipe
   "Model of a steam distribution network using fixed resistance pipe model for condensate returns"
-  extends Buildings.Experimental.DHC.Networks.BaseClasses.PartialDistribution2Pipe2Medium(
+  extends Buildings.DHC.Networks.BaseClasses.PartialDistribution2Pipe2Medium(
     redeclare ConnectionCondensatePipe con[nCon](
       each final dp_nominal=dp_nominal),
     redeclare model Model_pipDis=Buildings.Fluid.FixedResistances.LosslessPipe);
diff --git a/Buildings/Experimental/DHC/Networks/Steam/Examples/ConnectionCondensatePipe.mo b/Buildings/DHC/Networks/Steam/Examples/ConnectionCondensatePipe.mo
similarity index 94%
rename from Buildings/Experimental/DHC/Networks/Steam/Examples/ConnectionCondensatePipe.mo
rename to Buildings/DHC/Networks/Steam/Examples/ConnectionCondensatePipe.mo
index 8b18dfeb39f..d5c5b3c19f4 100644
--- a/Buildings/Experimental/DHC/Networks/Steam/Examples/ConnectionCondensatePipe.mo
+++ b/Buildings/DHC/Networks/Steam/Examples/ConnectionCondensatePipe.mo
@@ -1,4 +1,4 @@
-within Buildings.Experimental.DHC.Networks.Steam.Examples;
+within Buildings.DHC.Networks.Steam.Examples;
 model ConnectionCondensatePipe "Example model for the steam heating connection block"
   extends Modelica.Icons.Example;
 
@@ -51,7 +51,7 @@ model ConnectionCondensatePipe "Example model for the steam heating connection b
     nPorts=1)
     "Steam sink"
     annotation (Placement(transformation(extent={{80,20},{60,40}})));
-  Buildings.Experimental.DHC.Networks.Steam.ConnectionCondensatePipe con(
+  Buildings.DHC.Networks.Steam.ConnectionCondensatePipe con(
     redeclare package MediumSup = MediumSte,
     redeclare package MediumRet = MediumWat,
     mDis_flow_nominal=m_flow_nominal,
@@ -78,7 +78,7 @@ equation
   annotation (Icon(coordinateSystem(preserveAspectRatio=false)),
     Diagram(coordinateSystem(preserveAspectRatio=false)),
     experiment(StopTime=86400, Tolerance=1e-6),
-    __Dymola_Commands(file="modelica://Buildings/Resources/Scripts/Dymola/Experimental/DHC/Networks/Steam/Examples/ConnectionCondensatePipe.mos"
+    __Dymola_Commands(file="modelica://Buildings/Resources/Scripts/Dymola/DHC/Networks/Steam/Examples/ConnectionCondensatePipe.mos"
         "Simulate and plot"),
     Documentation(revisions="<html>
 <ul>
diff --git a/Buildings/Experimental/DHC/Networks/Steam/Examples/DistributionCondensatePipe.mo b/Buildings/DHC/Networks/Steam/Examples/DistributionCondensatePipe.mo
similarity index 92%
rename from Buildings/Experimental/DHC/Networks/Steam/Examples/DistributionCondensatePipe.mo
rename to Buildings/DHC/Networks/Steam/Examples/DistributionCondensatePipe.mo
index 31684971151..597c2d726f1 100644
--- a/Buildings/Experimental/DHC/Networks/Steam/Examples/DistributionCondensatePipe.mo
+++ b/Buildings/DHC/Networks/Steam/Examples/DistributionCondensatePipe.mo
@@ -1,4 +1,4 @@
-within Buildings.Experimental.DHC.Networks.Steam.Examples;
+within Buildings.DHC.Networks.Steam.Examples;
 model DistributionCondensatePipe
   "Example model for the steam heating distribution network"
   extends Modelica.Icons.Example;
@@ -46,7 +46,7 @@ model DistributionCondensatePipe
     nPorts=1)
     "Water condensate sink"
     annotation (Placement(transformation(extent={{-80,-40},{-60,-20}})));
-  Buildings.Experimental.DHC.Networks.Steam.DistributionCondensatePipe dis(
+  Buildings.DHC.Networks.Steam.DistributionCondensatePipe dis(
     redeclare package MediumSup = MediumSte,
     redeclare package MediumRet = MediumWat,
     nCon=2,
@@ -55,7 +55,7 @@ model DistributionCondensatePipe
     energyDynamics=Modelica.Fluid.Types.Dynamics.SteadyState,
     dp_nominal=dp_nominal)
     annotation (Placement(transformation(extent={{-20,0},{20,20}})));
-  Buildings.Experimental.DHC.Loads.Steam.BuildingTimeSeriesAtETS bui[2](
+  Buildings.DHC.Loads.Steam.BuildingTimeSeriesAtETS bui[2](
     redeclare package MediumSte = MediumSte,
     redeclare package MediumWat = MediumWat,
     each pSte_nominal=pSat,
@@ -82,7 +82,7 @@ equation
     Diagram(coordinateSystem(preserveAspectRatio=false)),
     experiment(StopTime=86400, Tolerance=1e-6),
     __Dymola_Commands(file=
-      "modelica://Buildings/Resources/Scripts/Dymola/Experimental/DHC/Networks/Steam/Examples/DistributionCondensatePipe.mos"
+      "modelica://Buildings/Resources/Scripts/Dymola/DHC/Networks/Steam/Examples/DistributionCondensatePipe.mos"
       "Simulate and plot"),
     Documentation(revisions="<html>
 <ul>
diff --git a/Buildings/Experimental/DHC/Networks/Steam/Examples/package.mo b/Buildings/DHC/Networks/Steam/Examples/package.mo
similarity index 62%
rename from Buildings/Experimental/DHC/Networks/Steam/Examples/package.mo
rename to Buildings/DHC/Networks/Steam/Examples/package.mo
index abeac9d72b2..7c9c2521a58 100644
--- a/Buildings/Experimental/DHC/Networks/Steam/Examples/package.mo
+++ b/Buildings/DHC/Networks/Steam/Examples/package.mo
@@ -1,12 +1,12 @@
-within Buildings.Experimental.DHC.Networks.Steam;
+within Buildings.DHC.Networks.Steam;
 package Examples "Collection of models that illustrate model use and test models"
   extends Modelica.Icons.ExamplesPackage;
 
 annotation (Documentation(info="<html>
 <p>
 This package contains examples illustrating the use of the models in
-<a href=\"modelica://Buildings.Experimental.DHC.Networks.Steam\">
-Buildings.Experimental.DHC.Networks.Steam</a>.
+<a href=\"modelica://Buildings.DHC.Networks.Steam\">
+Buildings.DHC.Networks.Steam</a>.
 </p>
 </html>"));
 end Examples;
diff --git a/Buildings/Experimental/DHC/Networks/Steam/Examples/package.order b/Buildings/DHC/Networks/Steam/Examples/package.order
similarity index 100%
rename from Buildings/Experimental/DHC/Networks/Steam/Examples/package.order
rename to Buildings/DHC/Networks/Steam/Examples/package.order
diff --git a/Buildings/Experimental/DHC/Networks/Steam/package.mo b/Buildings/DHC/Networks/Steam/package.mo
similarity index 85%
rename from Buildings/Experimental/DHC/Networks/Steam/package.mo
rename to Buildings/DHC/Networks/Steam/package.mo
index c980940b4dd..f1f113237b7 100644
--- a/Buildings/Experimental/DHC/Networks/Steam/package.mo
+++ b/Buildings/DHC/Networks/Steam/package.mo
@@ -1,4 +1,4 @@
-within Buildings.Experimental.DHC.Networks;
+within Buildings.DHC.Networks;
 package Steam "Collection of models for distribution networks involving steam"
   extends Modelica.Icons.VariantsPackage;
 
diff --git a/Buildings/Experimental/DHC/Networks/Steam/package.order b/Buildings/DHC/Networks/Steam/package.order
similarity index 100%
rename from Buildings/Experimental/DHC/Networks/Steam/package.order
rename to Buildings/DHC/Networks/Steam/package.order
diff --git a/Buildings/Experimental/DHC/Networks/package.mo b/Buildings/DHC/Networks/package.mo
similarity index 90%
rename from Buildings/Experimental/DHC/Networks/package.mo
rename to Buildings/DHC/Networks/package.mo
index 9ef054eace5..c57aff4ef7f 100644
--- a/Buildings/Experimental/DHC/Networks/package.mo
+++ b/Buildings/DHC/Networks/package.mo
@@ -1,4 +1,4 @@
-within Buildings.Experimental.DHC;
+within Buildings.DHC;
 package Networks "Package of models for district energy distribution networks"
   extends Modelica.Icons.VariantsPackage;
 
diff --git a/Buildings/Experimental/DHC/Networks/package.order b/Buildings/DHC/Networks/package.order
similarity index 100%
rename from Buildings/Experimental/DHC/Networks/package.order
rename to Buildings/DHC/Networks/package.order
diff --git a/Buildings/Experimental/DHC/Plants/BaseClasses/PartialPlant.mo b/Buildings/DHC/Plants/BaseClasses/PartialPlant.mo
similarity index 90%
rename from Buildings/Experimental/DHC/Plants/BaseClasses/PartialPlant.mo
rename to Buildings/DHC/Plants/BaseClasses/PartialPlant.mo
index 1ba525525fe..4b6db67a2b6 100644
--- a/Buildings/Experimental/DHC/Plants/BaseClasses/PartialPlant.mo
+++ b/Buildings/DHC/Plants/BaseClasses/PartialPlant.mo
@@ -1,4 +1,4 @@
-within Buildings.Experimental.DHC.Plants.BaseClasses;
+within Buildings.DHC.Plants.BaseClasses;
 partial model PartialPlant
   "Partial class for modeling a plant"
   replaceable package Medium=Buildings.Media.Water
@@ -10,8 +10,8 @@ partial model PartialPlant
     annotation(Dialog(enable=
       typ == TypDisSys.CombinedGeneration1 or
       typ == TypDisSys.HeatingGeneration1));
-  parameter Buildings.Experimental.DHC.Types.DistrictSystemType
-  typ=Buildings.Experimental.DHC.Types.DistrictSystemType.CombinedGeneration2to4
+  parameter Buildings.DHC.Types.DistrictSystemType
+  typ=Buildings.DHC.Types.DistrictSystemType.CombinedGeneration2to4
     "Type of district system"
     annotation (Evaluate=true, Dialog(group="Configuration"));
   parameter Boolean have_fan=false
@@ -123,14 +123,14 @@ partial model PartialPlant
       Placement(transformation(extent={{380,100},{420,140}}),
         iconTransformation(extent={{300,80},{380,160}})));
 protected
-  final parameter Boolean have_hea=typ <> Buildings.Experimental.DHC.Types.DistrictSystemType.Cooling and
-  typ <> Buildings.Experimental.DHC.Types.DistrictSystemType.CombinedGeneration5
+  final parameter Boolean have_hea=typ <> Buildings.DHC.Types.DistrictSystemType.Cooling and
+  typ <> Buildings.DHC.Types.DistrictSystemType.CombinedGeneration5
   "Boolean flag to enable fluid connectors for heating service line";
-  final parameter Boolean have_coo=typ == Buildings.Experimental.DHC.Types.DistrictSystemType.CombinedGeneration1 or
-  typ == Buildings.Experimental.DHC.Types.DistrictSystemType.CombinedGeneration2to4 or
-  typ == Buildings.Experimental.DHC.Types.DistrictSystemType.Cooling
+  final parameter Boolean have_coo=typ == Buildings.DHC.Types.DistrictSystemType.CombinedGeneration1 or
+  typ == Buildings.DHC.Types.DistrictSystemType.CombinedGeneration2to4 or
+  typ == Buildings.DHC.Types.DistrictSystemType.Cooling
   "Boolean flag to enable fluid connectors for cooling service line";
-  final parameter Boolean have_serAmb=typ == Buildings.Experimental.DHC.Types.DistrictSystemType.CombinedGeneration5
+  final parameter Boolean have_serAmb=typ == Buildings.DHC.Types.DistrictSystemType.CombinedGeneration5
   "Boolean flag to enable fluid connector for ambient water service line";
   annotation (
     defaultComponentName="pla",
@@ -142,8 +142,8 @@ Partial class to be used for modeling a plant.
 <p>
 The connectors to the service lines are configured based on an enumeration
 defining the type of district system, see
-<a href=\"modelica://Buildings.Experimental.DHC.Types.DistrictSystemType\">
-Buildings.Experimental.DHC.Types.DistrictSystemType</a>.
+<a href=\"modelica://Buildings.DHC.Types.DistrictSystemType\">
+Buildings.DHC.Types.DistrictSystemType</a>.
 In case of a heating service line, the model allows for using two
 different media at the supply port <code>port_bSerHea</code> and at the return
 <code>port_aSerHea</code> to represent a steam supply and condensate
diff --git a/Buildings/DHC/Plants/BaseClasses/package.mo b/Buildings/DHC/Plants/BaseClasses/package.mo
new file mode 100644
index 00000000000..6adf245fa26
--- /dev/null
+++ b/Buildings/DHC/Plants/BaseClasses/package.mo
@@ -0,0 +1,15 @@
+within Buildings.DHC.Plants;
+package BaseClasses "Package with base classes"
+  extends Modelica.Icons.BasesPackage;
+
+  annotation (
+    preferredView="info",
+    Documentation(
+      info="<html>
+<p>
+This package contains base classes that are used to construct the classes in
+<a href=\"modelica://Buildings.DHC.Plants\">
+Buildings.DHC.Plants</a>.
+</p>
+</html>"));
+end BaseClasses;
diff --git a/Buildings/Experimental/DHC/Plants/BaseClasses/package.order b/Buildings/DHC/Plants/BaseClasses/package.order
similarity index 100%
rename from Buildings/Experimental/DHC/Plants/BaseClasses/package.order
rename to Buildings/DHC/Plants/BaseClasses/package.order
diff --git a/Buildings/Experimental/DHC/Plants/Combined/AllElectricCWStorage.mo b/Buildings/DHC/Plants/Combined/AllElectricCWStorage.mo
similarity index 99%
rename from Buildings/Experimental/DHC/Plants/Combined/AllElectricCWStorage.mo
rename to Buildings/DHC/Plants/Combined/AllElectricCWStorage.mo
index 433db202cfa..ae3f3f597b9 100644
--- a/Buildings/Experimental/DHC/Plants/Combined/AllElectricCWStorage.mo
+++ b/Buildings/DHC/Plants/Combined/AllElectricCWStorage.mo
@@ -1,8 +1,8 @@
-within Buildings.Experimental.DHC.Plants.Combined;
+within Buildings.DHC.Plants.Combined;
 model AllElectricCWStorage
   "All-electric CHW and HW plant with CW storage"
   extends BaseClasses.PartialPlant(
-    final typ=Buildings.Experimental.DHC.Types.DistrictSystemType.CombinedGeneration2to4,
+    final typ=Buildings.DHC.Types.DistrictSystemType.CombinedGeneration2to4,
     final have_weaBus=true,
     final have_fan=true,
     final have_pum=true,
@@ -81,7 +81,7 @@ model AllElectricCWStorage
     "Design (maximum) CHW return temperature"
     annotation(Dialog(group="CHW loop and cooling-only chillers"));
   // Plant capacity computed with HRCs in direct heat recovery mode, see
-  // Buildings.Experimental.DHC.Plants.Combined.Controls.BaseClasses.StagingPlant.
+  // Buildings.DHC.Plants.Combined.Controls.BaseClasses.StagingPlant.
   final parameter Modelica.Units.SI.HeatFlowRate QChiWat_flow_nominal=
     chi.QChiWat_flow_nominal + chiHea.QChiWat_flow_nominal
     "Design plant cooling heat flow rate (all units)";
@@ -263,7 +263,7 @@ model AllElectricCWStorage
     annotation (Dialog(group="CW loop, TES tank and heat pumps"),
     Placement(transformation(extent={{160,340},{180,360}})));
 
-  // Cooling tower loop
+  // Buildings.DHC.Plants.Cooling tower loop
   parameter Integer nCoo(final min=1, start=1)
     "Number of cooling tower cells operating at design conditions"
     annotation (Dialog(group="Cooling tower loop"),
@@ -841,7 +841,7 @@ model AllElectricCWStorage
         origin={80,-60})));
 
   // Controls
-  Buildings.Experimental.DHC.Plants.Combined.Controls.Controller ctl(
+  Buildings.DHC.Plants.Combined.Controls.Controller ctl(
     final nChi=nChi,
     final nPumChiWat=nPumChiWat,
     final QHeaPum_flow_nominal=datHeaPum.hea.Q_flow*nHeaPum,
@@ -1529,14 +1529,14 @@ units (for instance the chiller isolation valve control) is only illustrated for
 one unit.
 The detailed description of each control function is available in the documentation
 of
-<a href=\"modelica://Buildings.Experimental.DHC.Plants.Combined.Controls.Controller\">
-Buildings.Experimental.DHC.Plants.Combined.Controls.Controller</a>.
+<a href=\"modelica://Buildings.DHC.Plants.Combined.Controls.Controller\">
+Buildings.DHC.Plants.Combined.Controls.Controller</a>.
 For an overview of the different operating modes and the design principles of such
 a system, the user may refer to the article by <a href=\"#Gill2021\">B. Gill (2021)</a>.
 </p>
 <p align=\"left\">
 <img alt=\"System schematic\"
-src=\"modelica://Buildings/Resources/Images/Experimental/DHC/Plants/Combined/AllElectricCWStorage.png\"/>
+src=\"modelica://Buildings/Resources/Images/DHC/Plants/Combined/AllElectricCWStorage.png\"/>
 </p>
 <h4>Control points</h4>
 <h5>Cooling and heating Enable signals</h5>
diff --git a/Buildings/Experimental/DHC/Plants/Combined/Controls/BaseClasses/CoolingTowerLoop.mo b/Buildings/DHC/Plants/Combined/Controls/BaseClasses/CoolingTowerLoop.mo
similarity index 98%
rename from Buildings/Experimental/DHC/Plants/Combined/Controls/BaseClasses/CoolingTowerLoop.mo
rename to Buildings/DHC/Plants/Combined/Controls/BaseClasses/CoolingTowerLoop.mo
index e4dd0ccd5af..c2141b471ef 100644
--- a/Buildings/Experimental/DHC/Plants/Combined/Controls/BaseClasses/CoolingTowerLoop.mo
+++ b/Buildings/DHC/Plants/Combined/Controls/BaseClasses/CoolingTowerLoop.mo
@@ -1,4 +1,4 @@
-within Buildings.Experimental.DHC.Plants.Combined.Controls.BaseClasses;
+within Buildings.DHC.Plants.Combined.Controls.BaseClasses;
 block CoolingTowerLoop "Cooling tower loop control"
 
   parameter Modelica.Units.SI.MassFlowRate mConWatHexCoo_flow_nominal
@@ -24,8 +24,8 @@ block CoolingTowerLoop "Cooling tower loop control"
     "Tower pump speed needed to maintain minimum tower flow (each pump stage)";
 
   Buildings.Controls.OBC.CDL.Interfaces.IntegerInput mode(
-    final min=Buildings.Experimental.DHC.Plants.Combined.Controls.ModeCondenserLoop.tankCharge,
-    final max=Buildings.Experimental.DHC.Plants.Combined.Controls.ModeCondenserLoop.heatRejection)
+    final min=Buildings.DHC.Plants.Combined.Controls.ModeCondenserLoop.tankCharge,
+    final max=Buildings.DHC.Plants.Combined.Controls.ModeCondenserLoop.heatRejection)
     "Condenser loop operating mode"
     annotation (Placement(transformation(extent={{-220,240},{-180,280}}),
         iconTransformation(extent={{-140,140},{-100,180}})));
@@ -114,7 +114,7 @@ block CoolingTowerLoop "Cooling tower loop control"
         rotation=0,
         origin={-20,260})));
   Buildings.Controls.OBC.CDL.Integers.Sources.Constant modRej(
-    final k=Buildings.Experimental.DHC.Plants.Combined.Controls.ModeCondenserLoop.heatRejection)
+    final k=Buildings.DHC.Plants.Combined.Controls.ModeCondenserLoop.heatRejection)
     "Heat rejection mode index"
     annotation (Placement(transformation(extent={{-150,230},{-130,250}})));
   Buildings.Controls.OBC.CDL.Integers.Equal isModRej "Heat rejection mode"
@@ -182,12 +182,12 @@ block CoolingTowerLoop "Cooling tower loop control"
   Buildings.Controls.OBC.CDL.Reals.AddParameter addApp(final p=
         dTHexCoo_nominal) "Add HX approach"
     annotation (Placement(transformation(extent={{-40,-210},{-20,-190}})));
-  EnergyTransferStations.Combined.Controls.PIDWithEnable ctlPum1(
+  ETS.Combined.Controls.PIDWithEnable ctlPum1(
     k=0.01,
     Ti=60,
     final reverseActing=false) "Pump control loop #1"
     annotation (Placement(transformation(extent={{-10,-210},{10,-190}})));
-  EnergyTransferStations.Combined.Controls.PIDWithEnable ctlPum2(
+  ETS.Combined.Controls.PIDWithEnable ctlPum2(
     k=0.01,
     Ti=60,
     final reverseActing=false)
@@ -221,7 +221,7 @@ block CoolingTowerLoop "Cooling tower loop control"
   Buildings.Controls.OBC.CDL.Reals.Sources.Constant yFan[2](final k={0.7,1.0})
     "y-value for maximum fan speed reset"
     annotation (Placement(transformation(extent={{30,120},{50,140}})));
-  EnergyTransferStations.Combined.Controls.PIDWithEnable ctlFan(
+  ETS.Combined.Controls.PIDWithEnable ctlFan(
     k=0.05,
     Ti=60,
     final reverseActing=false) "Fan control loop"
diff --git a/Buildings/Experimental/DHC/Plants/Combined/Controls/BaseClasses/DirectHeatRecovery.mo b/Buildings/DHC/Plants/Combined/Controls/BaseClasses/DirectHeatRecovery.mo
similarity index 99%
rename from Buildings/Experimental/DHC/Plants/Combined/Controls/BaseClasses/DirectHeatRecovery.mo
rename to Buildings/DHC/Plants/Combined/Controls/BaseClasses/DirectHeatRecovery.mo
index 1cd733cbc7e..761b8e5e1ff 100644
--- a/Buildings/Experimental/DHC/Plants/Combined/Controls/BaseClasses/DirectHeatRecovery.mo
+++ b/Buildings/DHC/Plants/Combined/Controls/BaseClasses/DirectHeatRecovery.mo
@@ -1,4 +1,4 @@
-within Buildings.Experimental.DHC.Plants.Combined.Controls.BaseClasses;
+within Buildings.DHC.Plants.Combined.Controls.BaseClasses;
 block DirectHeatRecovery
   "Block controlling HRC in direct heat recovery mode"
 
@@ -74,7 +74,7 @@ block DirectHeatRecovery
   Buildings.Controls.OBC.CDL.Routing.RealScalarReplicator rep(
     final nout=nChiHea) "Replicate"
     annotation (Placement(transformation(extent={{-120,-10},{-100,10}})));
-  EnergyTransferStations.Combined.Controls.PIDWithEnable ctl[nChiHea](
+  ETS.Combined.Controls.PIDWithEnable ctl[nChiHea](
     each final k=k,
     each final Ti=Ti,
     each final reverseActing=false,
diff --git a/Buildings/Experimental/DHC/Plants/Combined/Controls/BaseClasses/IntegerArrayHold.mo b/Buildings/DHC/Plants/Combined/Controls/BaseClasses/IntegerArrayHold.mo
similarity index 96%
rename from Buildings/Experimental/DHC/Plants/Combined/Controls/BaseClasses/IntegerArrayHold.mo
rename to Buildings/DHC/Plants/Combined/Controls/BaseClasses/IntegerArrayHold.mo
index f67871ec513..0213d92efca 100644
--- a/Buildings/Experimental/DHC/Plants/Combined/Controls/BaseClasses/IntegerArrayHold.mo
+++ b/Buildings/DHC/Plants/Combined/Controls/BaseClasses/IntegerArrayHold.mo
@@ -1,4 +1,4 @@
-within Buildings.Experimental.DHC.Plants.Combined.Controls.BaseClasses;
+within Buildings.DHC.Plants.Combined.Controls.BaseClasses;
 block IntegerArrayHold
   "Block that holds the value of an integer array for a given time"
   parameter Integer nin=0
diff --git a/Buildings/Experimental/DHC/Plants/Combined/Controls/BaseClasses/ModeCondenserLoop.mo b/Buildings/DHC/Plants/Combined/Controls/BaseClasses/ModeCondenserLoop.mo
similarity index 97%
rename from Buildings/Experimental/DHC/Plants/Combined/Controls/BaseClasses/ModeCondenserLoop.mo
rename to Buildings/DHC/Plants/Combined/Controls/BaseClasses/ModeCondenserLoop.mo
index bef6d3d628a..86a0ffbc524 100644
--- a/Buildings/Experimental/DHC/Plants/Combined/Controls/BaseClasses/ModeCondenserLoop.mo
+++ b/Buildings/DHC/Plants/Combined/Controls/BaseClasses/ModeCondenserLoop.mo
@@ -1,4 +1,4 @@
-within Buildings.Experimental.DHC.Plants.Combined.Controls.BaseClasses;
+within Buildings.DHC.Plants.Combined.Controls.BaseClasses;
 block ModeCondenserLoop
   "Block that determines the condenser loop mode"
 
@@ -35,8 +35,8 @@ block ModeCondenserLoop
         transformation(extent={{-240,0},{-200,40}}),      iconTransformation(
           extent={{-140,-20},{-100,20}})));
   Buildings.Controls.OBC.CDL.Interfaces.IntegerOutput mode(
-    final min=Buildings.Experimental.DHC.Plants.Combined.Controls.ModeCondenserLoop.tankCharge,
-    final max=Buildings.Experimental.DHC.Plants.Combined.Controls.ModeCondenserLoop.heatRejection)
+    final min=Buildings.DHC.Plants.Combined.Controls.ModeCondenserLoop.tankCharge,
+    final max=Buildings.DHC.Plants.Combined.Controls.ModeCondenserLoop.heatRejection)
     "Condenser loop operating mode"
     annotation (Placement(transformation(extent={{200,-20},{240,20}}),
         iconTransformation(extent={{100,-20},{140,20}})));
@@ -139,15 +139,15 @@ block ModeCondenserLoop
   Buildings.Controls.OBC.CDL.Logical.Latch enaRej "Enable heat rejection mode"
     annotation (Placement(transformation(extent={{80,90},{100,110}})));
   Buildings.Controls.OBC.CDL.Integers.Sources.Constant modTan(
-    final k=Buildings.Experimental.DHC.Plants.Combined.Controls.ModeCondenserLoop.tankCharge)
+    final k=Buildings.DHC.Plants.Combined.Controls.ModeCondenserLoop.tankCharge)
     "Tank Charge/Discharge mode"
     annotation (Placement(transformation(extent={{110,50},{130,70}})));
   Buildings.Controls.OBC.CDL.Integers.Sources.Constant modRej(
-    final k=Buildings.Experimental.DHC.Plants.Combined.Controls.ModeCondenserLoop.heatRejection)
+    final k=Buildings.DHC.Plants.Combined.Controls.ModeCondenserLoop.heatRejection)
     "Heat rejection mode"
     annotation (Placement(transformation(extent={{108,130},{128,150}})));
   Buildings.Controls.OBC.CDL.Integers.Sources.Constant modCha(
-    final k=Buildings.Experimental.DHC.Plants.Combined.Controls.ModeCondenserLoop.chargeAssist)
+    final k=Buildings.DHC.Plants.Combined.Controls.ModeCondenserLoop.chargeAssist)
     "Charge assist mode"
     annotation (Placement(transformation(extent={{110,-50},{130,-30}})));
   Buildings.Controls.OBC.CDL.Integers.Switch intSwi
@@ -407,8 +407,8 @@ where <i>&Delta;t</i> is the time period in seconds.
 <h4>Operating modes</h4>
 <p>
 Three operating modes are defined within
-<a href=\"modelica://Buildings.Experimental.DHC.Plants.Combined.Controls.ModeCondenserLoop\">
-Buildings.Experimental.DHC.Plants.Combined.Controls.ModeCondenserLoop</a>.
+<a href=\"modelica://Buildings.DHC.Plants.Combined.Controls.ModeCondenserLoop\">
+Buildings.DHC.Plants.Combined.Controls.ModeCondenserLoop</a>.
 </p>
 <h5>Charge Assist</h5>
 <p>
diff --git a/Buildings/Experimental/DHC/Plants/Combined/Controls/BaseClasses/ModeHeatRecoveryChiller.mo b/Buildings/DHC/Plants/Combined/Controls/BaseClasses/ModeHeatRecoveryChiller.mo
similarity index 97%
rename from Buildings/Experimental/DHC/Plants/Combined/Controls/BaseClasses/ModeHeatRecoveryChiller.mo
rename to Buildings/DHC/Plants/Combined/Controls/BaseClasses/ModeHeatRecoveryChiller.mo
index d6857bdee4b..7c1b5aba837 100644
--- a/Buildings/Experimental/DHC/Plants/Combined/Controls/BaseClasses/ModeHeatRecoveryChiller.mo
+++ b/Buildings/DHC/Plants/Combined/Controls/BaseClasses/ModeHeatRecoveryChiller.mo
@@ -1,4 +1,4 @@
-within Buildings.Experimental.DHC.Plants.Combined.Controls.BaseClasses;
+within Buildings.DHC.Plants.Combined.Controls.BaseClasses;
 block ModeHeatRecoveryChiller
   "Block that computes the cascading cooling and direct HR switchover signals"
 
diff --git a/Buildings/Experimental/DHC/Plants/Combined/Controls/BaseClasses/PartialController.mo b/Buildings/DHC/Plants/Combined/Controls/BaseClasses/PartialController.mo
similarity index 99%
rename from Buildings/Experimental/DHC/Plants/Combined/Controls/BaseClasses/PartialController.mo
rename to Buildings/DHC/Plants/Combined/Controls/BaseClasses/PartialController.mo
index 61a4a4c4965..e71634d2cd4 100644
--- a/Buildings/Experimental/DHC/Plants/Combined/Controls/BaseClasses/PartialController.mo
+++ b/Buildings/DHC/Plants/Combined/Controls/BaseClasses/PartialController.mo
@@ -1,4 +1,4 @@
-within Buildings.Experimental.DHC.Plants.Combined.Controls.BaseClasses;
+within Buildings.DHC.Plants.Combined.Controls.BaseClasses;
 block PartialController "Interface class for plant controller"
 
   parameter Integer nChi(final min=1, start=1)
diff --git a/Buildings/Experimental/DHC/Plants/Combined/Controls/BaseClasses/StageIndex.mo b/Buildings/DHC/Plants/Combined/Controls/BaseClasses/StageIndex.mo
similarity index 99%
rename from Buildings/Experimental/DHC/Plants/Combined/Controls/BaseClasses/StageIndex.mo
rename to Buildings/DHC/Plants/Combined/Controls/BaseClasses/StageIndex.mo
index 3bb131b037a..5dbeb4395bf 100644
--- a/Buildings/Experimental/DHC/Plants/Combined/Controls/BaseClasses/StageIndex.mo
+++ b/Buildings/DHC/Plants/Combined/Controls/BaseClasses/StageIndex.mo
@@ -1,4 +1,4 @@
-within Buildings.Experimental.DHC.Plants.Combined.Controls.BaseClasses;
+within Buildings.DHC.Plants.Combined.Controls.BaseClasses;
 block StageIndex
   "Block that computes the stage index out of staging signals"
 
diff --git a/Buildings/Experimental/DHC/Plants/Combined/Controls/BaseClasses/StagingPlant.mo b/Buildings/DHC/Plants/Combined/Controls/BaseClasses/StagingPlant.mo
similarity index 97%
rename from Buildings/Experimental/DHC/Plants/Combined/Controls/BaseClasses/StagingPlant.mo
rename to Buildings/DHC/Plants/Combined/Controls/BaseClasses/StagingPlant.mo
index 5533523e0c5..84917c63de1 100644
--- a/Buildings/Experimental/DHC/Plants/Combined/Controls/BaseClasses/StagingPlant.mo
+++ b/Buildings/DHC/Plants/Combined/Controls/BaseClasses/StagingPlant.mo
@@ -1,4 +1,4 @@
-within Buildings.Experimental.DHC.Plants.Combined.Controls.BaseClasses;
+within Buildings.DHC.Plants.Combined.Controls.BaseClasses;
 block StagingPlant
   "Block that computes plant stage and command signals for chillers and HRC"
 
@@ -177,7 +177,7 @@ block StagingPlant
         origin={-70,0})));
   Buildings.Controls.OBC.CDL.Integers.Subtract numChiCasCoo
     "Number of HRC required in cascading cooling" annotation (Placement(transformation(extent={{40,10},{60,30}})));
-  ModeHeatRecoveryChiller modHeaCoo(final nChiHea=nChiHea)
+  Buildings.DHC.Plants.Combined.Controls.BaseClasses.ModeHeatRecoveryChiller modHeaCoo(final nChiHea=nChiHea)
     "Compute the cascading cooling and direct HR switchover signals" annotation (Placement(transformation(extent={{180,-10},{200,10}})));
 
   Buildings.Controls.OBC.CDL.Integers.Min nChiHeaHeaAndCoo
@@ -203,7 +203,7 @@ block StagingPlant
     "Apply failsafe condition only in stage >= 1" annotation (Placement(transformation(extent={{-140,250},{-120,270}})));
   Buildings.Controls.OBC.CDL.Logical.And and3
     "Apply failsafe condition only in stage >= 1" annotation (Placement(transformation(extent={{-140,200},{-120,220}})));
-  StageIndex staCoo(final nSta=nChi + nChiHea, tSta=15*60)
+  Buildings.DHC.Plants.Combined.Controls.BaseClasses.StageIndex staCoo(final nSta=nChi + nChiHea, tSta=15*60)
     "Compute cooling stage" annotation (Placement(transformation(extent={{50,144},{70,164}})));
   Modelica.Blocks.Sources.RealExpression capCoo(final y=abs(PLRStaTra*(min(nChi,
         staCoo.preIdxSta)/nChi*QChiWatChi_flow_nominal + max(0, staCoo.preIdxSta
@@ -229,7 +229,7 @@ block StagingPlant
     "Check OPLR limit" annotation (Placement(transformation(extent={{-80,-130},{-60,-110}})));
   Buildings.Controls.OBC.CDL.Logical.Timer timOPLRExcLim1(t=15*60)
     "Timer for OPLR exceeding limit" annotation (Placement(transformation(extent={{-50,-130},{-30,-110}})));
-  StageIndex staHea(final nSta=nChiHea, tSta=15*60) "Compute heating stage" annotation (Placement(transformation(extent={{50,-130},{70,-110}})));
+  Buildings.DHC.Plants.Combined.Controls.BaseClasses.StageIndex staHea(final nSta=nChiHea, tSta=15*60) "Compute heating stage" annotation (Placement(transformation(extent={{50,-130},{70,-110}})));
   Modelica.Blocks.Sources.RealExpression capHeaLow(final y=PLRStaTra*max(0,
         staHea.preIdxSta - 1)/nChiHea*QHeaWat_flow_nominal)
     "Total capacity at next lower stage times stage-down PLR limit" annotation (Placement(transformation(extent={{-120,-178},{-100,-158}})));
@@ -271,7 +271,7 @@ block StagingPlant
     "Failsafe condition or efficiency condition to stage up" annotation (Placement(transformation(extent={{10,-130},{30,-110}})));
   Buildings.Controls.OBC.CDL.Logical.And dowAndNotFail1
     "No stage up failsafe condition and efficiency condition to stage down" annotation (Placement(transformation(extent={{10,-170},{30,-150}})));
-  IntegerArrayHold hol(holdDuration=15*60, nin=4)
+  Buildings.DHC.Plants.Combined.Controls.BaseClasses.IntegerArrayHold hol(holdDuration=15*60, nin=4)
     "Minimum plant stage runtime (needed because cooling and heating stage runtimes are handled separately)" annotation (Placement(transformation(extent={{130,-10},{150,10}})));
 
 equation
@@ -528,8 +528,8 @@ to cascading heating or cascading cooling mode. Only when all HRCs are operating
 and when a new stage up event is initiated, an additional HRC is then switched
 to operate in direct heat recovery mode.
 As described in
-<a href=\"modelica://Buildings.Experimental.DHC.Plants.Combined.Controls.BaseClasses.ModeHeatRecoveryChiller\">
-Buildings.Experimental.DHC.Plants.Combined.Controls.BaseClasses.ModeHeatRecoveryChiller</a>
+<a href=\"modelica://Buildings.DHC.Plants.Combined.Controls.BaseClasses.ModeHeatRecoveryChiller\">
+Buildings.DHC.Plants.Combined.Controls.BaseClasses.ModeHeatRecoveryChiller</a>
 the HRC with the highest index that is not operating operating in cascading
 cooling mode is the next to be switched into direct heat recovery mode.
 </p>
@@ -543,7 +543,7 @@ in cooling (resp. heating) mode, the units marked with a star (<code>*</code>) o
 in direct heat recovery mode.
 </p>
 <table border=\"1\" summary=\"Explanation of the enumeration\">
-<tr><th>Heating stage &darr; Cooling stage &rarr;</th>
+<tr><th>Heating stage &darr; Buildings.DHC.Plants.Cooling stage &rarr;</th>
 <td>0</td>
 <td>1</td>
 <td>2</td>
diff --git a/Buildings/Experimental/DHC/Plants/Combined/Controls/BaseClasses/StagingPump.mo b/Buildings/DHC/Plants/Combined/Controls/BaseClasses/StagingPump.mo
similarity index 98%
rename from Buildings/Experimental/DHC/Plants/Combined/Controls/BaseClasses/StagingPump.mo
rename to Buildings/DHC/Plants/Combined/Controls/BaseClasses/StagingPump.mo
index 3ba25cbb4ce..89fd7216c6e 100644
--- a/Buildings/Experimental/DHC/Plants/Combined/Controls/BaseClasses/StagingPump.mo
+++ b/Buildings/DHC/Plants/Combined/Controls/BaseClasses/StagingPump.mo
@@ -1,4 +1,4 @@
-within Buildings.Experimental.DHC.Plants.Combined.Controls.BaseClasses;
+within Buildings.DHC.Plants.Combined.Controls.BaseClasses;
 block StagingPump "Pump staging"
 
   parameter Boolean have_flowCriterion=true
@@ -89,7 +89,7 @@ block StagingPump "Pump staging"
   Buildings.Controls.OBC.CDL.Routing.IntegerScalarReplicator rep(
     final nout=nPum) "Replicate"
     annotation (Placement(transformation(extent={{120,-10},{140,10}})));
-  StageIndex staLag(final nSta=max(1, nPum - 1), tSta=30)
+  Buildings.DHC.Plants.Combined.Controls.BaseClasses.StageIndex staLag(final nSta=max(1, nPum - 1), tSta=30)
     if nPum>1
     "Stage lag pumps (minimum runtime allowing for pump start time)"
     annotation (Placement(transformation(extent={{30,-10},{50,10}})));
diff --git a/Buildings/Experimental/DHC/Plants/Combined/Controls/BaseClasses/TankCycle.mo b/Buildings/DHC/Plants/Combined/Controls/BaseClasses/TankCycle.mo
similarity index 98%
rename from Buildings/Experimental/DHC/Plants/Combined/Controls/BaseClasses/TankCycle.mo
rename to Buildings/DHC/Plants/Combined/Controls/BaseClasses/TankCycle.mo
index aa2e51b8ff1..664ee6aee6d 100644
--- a/Buildings/Experimental/DHC/Plants/Combined/Controls/BaseClasses/TankCycle.mo
+++ b/Buildings/DHC/Plants/Combined/Controls/BaseClasses/TankCycle.mo
@@ -1,4 +1,4 @@
-within Buildings.Experimental.DHC.Plants.Combined.Controls.BaseClasses;
+within Buildings.DHC.Plants.Combined.Controls.BaseClasses;
 block TankCycle "Block that determines the tank cycle flag"
 
   parameter Modelica.Units.SI.MassFlowRate mConWatHexCoo_flow_nominal
@@ -103,7 +103,7 @@ block TankCycle "Block that determines the tank cycle flag"
   Buildings.Controls.OBC.CDL.Logical.Not criFlo2
     "Flow criterion for second tank cycle"
     annotation (Placement(transformation(extent={{-140,70},{-120,90}})));
-  IntegerArrayHold hol(holdDuration=30*60, nin=1) "Hold for minimum runtime"
+  Buildings.DHC.Plants.Combined.Controls.BaseClasses.IntegerArrayHold hol(holdDuration=30*60, nin=1) "Hold for minimum runtime"
     annotation (Placement(transformation(extent={{136,-10},{156,10}})));
 initial equation
   pre(idxCycTan)=idxIni.y;
diff --git a/Buildings/Experimental/DHC/Plants/Combined/Controls/BaseClasses/Validation/StageIndex.mo b/Buildings/DHC/Plants/Combined/Controls/BaseClasses/Validation/StageIndex.mo
similarity index 70%
rename from Buildings/Experimental/DHC/Plants/Combined/Controls/BaseClasses/Validation/StageIndex.mo
rename to Buildings/DHC/Plants/Combined/Controls/BaseClasses/Validation/StageIndex.mo
index 3e8c76315f7..1fe120fcaca 100644
--- a/Buildings/Experimental/DHC/Plants/Combined/Controls/BaseClasses/Validation/StageIndex.mo
+++ b/Buildings/DHC/Plants/Combined/Controls/BaseClasses/Validation/StageIndex.mo
@@ -1,8 +1,8 @@
-within Buildings.Experimental.DHC.Plants.Combined.Controls.BaseClasses.Validation;
+within Buildings.DHC.Plants.Combined.Controls.BaseClasses.Validation;
 model StageIndex
   extends Modelica.Icons.Example;
 
-  Buildings.Experimental.DHC.Plants.Combined.Controls.BaseClasses.StageIndex
+  Buildings.DHC.Plants.Combined.Controls.BaseClasses.StageIndex
     sta(nSta=3, tSta=60) "Staging"
     annotation (Placement(transformation(extent={{-10,-10},{10,10}})));
   Buildings.Controls.OBC.CDL.Logical.Sources.TimeTable booTimTab(
@@ -21,7 +21,7 @@ equation
 
 annotation (
     __Dymola_Commands(
-      file="modelica://Buildings/Resources/Scripts/Dymola/Experimental/DHC/Plants/Combined/Controls/BaseClasses/Validation/StageIndex.mos"
+      file="modelica://Buildings/Resources/Scripts/Dymola/DHC/Plants/Combined/Controls/BaseClasses/Validation/StageIndex.mos"
       "Simulate and plot"),
     experiment(
       StopTime=1000,
@@ -29,8 +29,8 @@ annotation (
     Documentation(info="<html>
 <p>
 This is a validation model for the block
-<a href=\"modelica://Buildings.Experimental.DHC.Plants.Combined.Controls.BaseClasses.StageIndex\">
-Buildings.Experimental.DHC.Plants.Combined.Controls.BaseClasses.StageIndex</a>.
+<a href=\"modelica://Buildings.DHC.Plants.Combined.Controls.BaseClasses.StageIndex\">
+Buildings.DHC.Plants.Combined.Controls.BaseClasses.StageIndex</a>.
 </p>
 </html>", revisions="<html>
 <ul>
diff --git a/Buildings/Experimental/DHC/Plants/Combined/Controls/BaseClasses/Validation/StagingPlant.mo b/Buildings/DHC/Plants/Combined/Controls/BaseClasses/Validation/StagingPlant.mo
similarity index 93%
rename from Buildings/Experimental/DHC/Plants/Combined/Controls/BaseClasses/Validation/StagingPlant.mo
rename to Buildings/DHC/Plants/Combined/Controls/BaseClasses/Validation/StagingPlant.mo
index f5cd54c4c52..c6b7dbe16d4 100644
--- a/Buildings/Experimental/DHC/Plants/Combined/Controls/BaseClasses/Validation/StagingPlant.mo
+++ b/Buildings/DHC/Plants/Combined/Controls/BaseClasses/Validation/StagingPlant.mo
@@ -1,4 +1,4 @@
-within Buildings.Experimental.DHC.Plants.Combined.Controls.BaseClasses.Validation;
+within Buildings.DHC.Plants.Combined.Controls.BaseClasses.Validation;
 model StagingPlant "Validation of plant staging block"
   extends Modelica.Icons.Example;
 
@@ -34,7 +34,7 @@ model StagingPlant "Validation of plant staging block"
     "HW design mass flow rate"
     annotation (Dialog(group="HW loop and heat recovery chillers"));
 
-  BaseClasses.StagingPlant
+  Buildings.DHC.Plants.Combined.Controls.BaseClasses.StagingPlant
     staChi(
     final nChi=nChi,
     final nChiHea=nChiHea,
@@ -114,7 +114,7 @@ equation
     annotation (Line(points={{-78,20},{0,20},{0,0},{10,0}}, color={0,0,127}));
           annotation (
               __Dymola_Commands(
-      file="modelica://Buildings/Resources/Scripts/Dymola/Experimental/DHC/Plants/Combined/Controls/BaseClasses/Validation/StagingPlant.mos"
+      file="modelica://Buildings/Resources/Scripts/Dymola/DHC/Plants/Combined/Controls/BaseClasses/Validation/StagingPlant.mos"
       "Simulate and plot"),
     experiment(
       StopTime=30000,
@@ -123,8 +123,8 @@ equation
     Documentation(info="<html>
 <p>
 This is a validation model for the plant staging logic implemented in
-<a href=\"modelica://Buildings.Experimental.DHC.Plants.Combined.Controls.BaseClasses.StagingPlant\">
-Buildings.Experimental.DHC.Plants.Combined.Controls.BaseClasses.StagingPlant</a>.
+<a href=\"modelica://Buildings.DHC.Plants.Combined.Controls.BaseClasses.StagingPlant\">
+Buildings.DHC.Plants.Combined.Controls.BaseClasses.StagingPlant</a>.
 </p>
 </html>", revisions="<html>
 <ul>
diff --git a/Buildings/Experimental/DHC/Plants/Combined/Controls/BaseClasses/Validation/StagingPump.mo b/Buildings/DHC/Plants/Combined/Controls/BaseClasses/Validation/StagingPump.mo
similarity index 82%
rename from Buildings/Experimental/DHC/Plants/Combined/Controls/BaseClasses/Validation/StagingPump.mo
rename to Buildings/DHC/Plants/Combined/Controls/BaseClasses/Validation/StagingPump.mo
index 73c5bd8ff98..9ea1e52f94a 100644
--- a/Buildings/Experimental/DHC/Plants/Combined/Controls/BaseClasses/Validation/StagingPump.mo
+++ b/Buildings/DHC/Plants/Combined/Controls/BaseClasses/Validation/StagingPump.mo
@@ -1,4 +1,4 @@
-within Buildings.Experimental.DHC.Plants.Combined.Controls.BaseClasses.Validation;
+within Buildings.DHC.Plants.Combined.Controls.BaseClasses.Validation;
 model StagingPump "Validation of pump staging block"
   extends Modelica.Icons.Example;
 
@@ -25,7 +25,7 @@ model StagingPump "Validation of pump staging block"
     timeScale=500)
     "Source signal"
     annotation (Placement(transformation(extent={{-80,30},{-60,50}})));
-  Buildings.Experimental.DHC.Plants.Combined.Controls.BaseClasses.StagingPump
+  Buildings.DHC.Plants.Combined.Controls.BaseClasses.StagingPump
     staDet(
     final nPum=nPum,
     final m_flow_nominal=m_flow_nominal)
@@ -49,7 +49,7 @@ equation
     annotation (Line(points={{-18,0},{0,0},{0,6},{38,6}}, color={255,0,255}));
   annotation (
     __Dymola_Commands(
-      file="modelica://Buildings/Resources/Scripts/Dymola/Experimental/DHC/Plants/Combined/Controls/BaseClasses/Validation/StagingPump.mos"
+      file="modelica://Buildings/Resources/Scripts/Dymola/DHC/Plants/Combined/Controls/BaseClasses/Validation/StagingPump.mos"
       "Simulate and plot"),
     experiment(
       StopTime=5000,
@@ -59,8 +59,8 @@ equation
     Documentation(info="<html>
 <p>
 This is a validation model for the pump staging logic implemented in
-<a href=\"modelica://Buildings.Experimental.DHC.Plants.Combined.Controls.BaseClasses.StagingPump\">
-Buildings.Experimental.DHC.Plants.Combined.Controls.BaseClasses.StagingPump</a>.
+<a href=\"modelica://Buildings.DHC.Plants.Combined.Controls.BaseClasses.StagingPump\">
+Buildings.DHC.Plants.Combined.Controls.BaseClasses.StagingPump</a>.
 </p>
 </html>", revisions="<html>
 <ul>
diff --git a/Buildings/Experimental/DHC/Plants/Combined/Controls/BaseClasses/Validation/package.mo b/Buildings/DHC/Plants/Combined/Controls/BaseClasses/Validation/package.mo
similarity index 74%
rename from Buildings/Experimental/DHC/Plants/Combined/Controls/BaseClasses/Validation/package.mo
rename to Buildings/DHC/Plants/Combined/Controls/BaseClasses/Validation/package.mo
index 2d425a0bd74..bf8d36d2681 100644
--- a/Buildings/Experimental/DHC/Plants/Combined/Controls/BaseClasses/Validation/package.mo
+++ b/Buildings/DHC/Plants/Combined/Controls/BaseClasses/Validation/package.mo
@@ -1,4 +1,4 @@
-within Buildings.Experimental.DHC.Plants.Combined.Controls.BaseClasses;
+within Buildings.DHC.Plants.Combined.Controls.BaseClasses;
 package Validation "Package with validation models"
   extends Modelica.Icons.ExamplesPackage;
 
diff --git a/Buildings/Experimental/DHC/Plants/Combined/Controls/BaseClasses/Validation/package.order b/Buildings/DHC/Plants/Combined/Controls/BaseClasses/Validation/package.order
similarity index 100%
rename from Buildings/Experimental/DHC/Plants/Combined/Controls/BaseClasses/Validation/package.order
rename to Buildings/DHC/Plants/Combined/Controls/BaseClasses/Validation/package.order
diff --git a/Buildings/Experimental/DHC/Plants/Combined/Controls/BaseClasses/ValveCondenserEvaporator.mo b/Buildings/DHC/Plants/Combined/Controls/BaseClasses/ValveCondenserEvaporator.mo
similarity index 97%
rename from Buildings/Experimental/DHC/Plants/Combined/Controls/BaseClasses/ValveCondenserEvaporator.mo
rename to Buildings/DHC/Plants/Combined/Controls/BaseClasses/ValveCondenserEvaporator.mo
index 2515e8a6f23..84ebbd4349c 100644
--- a/Buildings/Experimental/DHC/Plants/Combined/Controls/BaseClasses/ValveCondenserEvaporator.mo
+++ b/Buildings/DHC/Plants/Combined/Controls/BaseClasses/ValveCondenserEvaporator.mo
@@ -1,4 +1,4 @@
-within Buildings.Experimental.DHC.Plants.Combined.Controls.BaseClasses;
+within Buildings.DHC.Plants.Combined.Controls.BaseClasses;
 block ValveCondenserEvaporator
   "Controller for chiller and HRC condenser and evaporator valves"
 
@@ -76,8 +76,8 @@ block ValveCondenserEvaporator
     "Index of active tank cycle"
     annotation (Placement(transformation(extent={{-280,80},{-240,120}}),
     iconTransformation(extent={{-140,60},{-100,100}})));
-  Buildings.Controls.OBC.CDL.Interfaces.IntegerInput mode(final min=Buildings.Experimental.DHC.Plants.Combined.Controls.ModeCondenserLoop.tankCharge,
-      final max=Buildings.Experimental.DHC.Plants.Combined.Controls.ModeCondenserLoop.heatRejection)
+  Buildings.Controls.OBC.CDL.Interfaces.IntegerInput mode(final min=Buildings.DHC.Plants.Combined.Controls.ModeCondenserLoop.tankCharge,
+      final max=Buildings.DHC.Plants.Combined.Controls.ModeCondenserLoop.heatRejection)
     "Condenser loop operating mode"
     annotation (Placement(transformation(extent={{-280,160},{-240,200}}),
         iconTransformation(extent={{-140,80},{-100,120}})));
@@ -322,7 +322,7 @@ block ValveCondenserEvaporator
         "1") "HW minimum flow bypass valve control signal" annotation (
       Placement(transformation(extent={{240,400},{280,440}}),
         iconTransformation(extent={{100,40},{140,80}})));
-  EnergyTransferStations.Combined.Controls.PIDWithEnable valEvaChi[nChi](
+  ETS.Combined.Controls.PIDWithEnable valEvaChi[nChi](
     each k=k,
     each Ti=Ti,
     each final yMin=yMin,
@@ -332,7 +332,7 @@ block ValveCondenserEvaporator
     each final y_neutral=y_neutral)
     "Chiller evaporator isolation valve control when HRC in direct HR"
     annotation (Placement(transformation(extent={{-110,390},{-90,410}})));
-  EnergyTransferStations.Combined.Controls.PIDWithEnable valConChi[nChi](
+  ETS.Combined.Controls.PIDWithEnable valConChi[nChi](
     each k=k,
     each Ti=Ti,
     each final yMin=yMin,
@@ -341,7 +341,7 @@ block ValveCondenserEvaporator
     each final y_reset=y_reset,
     each final y_neutral=y_neutral) "Chiller condenser isolation valve control"
     annotation (Placement(transformation(extent={{70,350},{90,370}})));
-  EnergyTransferStations.Combined.Controls.PIDWithEnable valEvaChiHea[nChiHea](
+  ETS.Combined.Controls.PIDWithEnable valEvaChiHea[nChiHea](
     each k=4*k,
     each Ti=Ti/3,
     each final yMin=yMin,
@@ -350,7 +350,7 @@ block ValveCondenserEvaporator
     each final y_reset=y_reset,
     each final y_neutral=y_neutral) "HRC evaporator isolation valve control"
     annotation (Placement(transformation(extent={{-130,-10},{-110,10}})));
-  EnergyTransferStations.Combined.Controls.PIDWithEnable valConChiHea[nChiHea](
+  ETS.Combined.Controls.PIDWithEnable valConChiHea[nChiHea](
     each k=k,
     each Ti=Ti,
     each final yMin=yMin,
@@ -540,7 +540,7 @@ block ValveCondenserEvaporator
         extent={{-10,-10},{10,10}},
         rotation=0,
         origin={-130,-380})));
-  EnergyTransferStations.Combined.Controls.PIDWithEnable valConSwi(
+  ETS.Combined.Controls.PIDWithEnable valConSwi(
     u_s(unit="K", displayUnit="degC"),
     u_m(unit="K", displayUnit="degC"),
     k=k,
@@ -591,7 +591,7 @@ block ValveCondenserEvaporator
         extent={{-10,-10},{10,10}},
         rotation=0,
         origin={-70,-360})));
-  EnergyTransferStations.Combined.Controls.PIDWithEnable ctlTConWatEvaLvg[nChiHea](
+  ETS.Combined.Controls.PIDWithEnable ctlTConWatEvaLvg[nChiHea](
     u_s(each final unit="K", each displayUnit="degC"),
     u_m(each final unit="K", each displayUnit="degC"),
     each final k=k/2,
@@ -639,7 +639,7 @@ block ValveCondenserEvaporator
   Buildings.Controls.OBC.CDL.Reals.Switch selFloSet[nChiHea]
     "Select HRC evaporator flow setpoint based on operating mode"
     annotation (Placement(transformation(extent={{-160,-10},{-140,10}})));
-  EnergyTransferStations.Combined.Controls.PIDWithEnable ctlTConWatEvaEnt(
+  ETS.Combined.Controls.PIDWithEnable ctlTConWatEvaEnt(
     u_s(final unit="K", displayUnit="degC"),
     u_m(final unit="K", displayUnit="degC"),
     k=k,
@@ -678,7 +678,7 @@ block ValveCondenserEvaporator
   Buildings.Controls.OBC.CDL.Routing.RealExtractor TConWatConRetSet(final nin=2)
     "Extract value at given index"
     annotation (Placement(transformation(extent={{-170,90},{-150,110}})));
-  EnergyTransferStations.Combined.Controls.PIDWithEnable ctlTConWatConRet(
+  ETS.Combined.Controls.PIDWithEnable ctlTConWatConRet(
     u_s(final unit="K", displayUnit="degC"),
     u_m(final unit="K", displayUnit="degC"),
     k=k,
@@ -693,7 +693,7 @@ block ValveCondenserEvaporator
   Buildings.Controls.OBC.CDL.Integers.Equal isChaAss
     "Check if charge assist mode is active"
     annotation (Placement(transformation(extent={{-170,150},{-150,170}})));
-  Buildings.Controls.OBC.CDL.Integers.Sources.Constant chaAss(final k=Buildings.Experimental.DHC.Plants.Combined.Controls.ModeCondenserLoop.chargeAssist)
+  Buildings.Controls.OBC.CDL.Integers.Sources.Constant chaAss(final k=Buildings.DHC.Plants.Combined.Controls.ModeCondenserLoop.chargeAssist)
     "Charge assist mode index"
     annotation (Placement(transformation(extent={{-210,150},{-190,170}})));
   Buildings.Controls.OBC.CDL.Reals.Line floCon[nChi + nChiHea]
@@ -718,7 +718,7 @@ block ValveCondenserEvaporator
         extent={{-10,-10},{10,10}},
         rotation=0,
         origin={30,-40})));
-  EnergyTransferStations.Combined.Controls.PIDWithEnable ctlTConLvgChi[nChi +
+  ETS.Combined.Controls.PIDWithEnable ctlTConLvgChi[nChi +
     nChiHea](
     u_s(each final unit="K", each displayUnit="degC"),
     u_m(each final unit="K", each displayUnit="degC"),
@@ -731,7 +731,7 @@ block ValveCondenserEvaporator
     each final y_neutral=0) "Condenser leaving temperature control"
     annotation (Placement(transformation(extent={{-70,250},{-50,270}})));
 
-  Buildings.Controls.OBC.CDL.Integers.Sources.Constant tanCha(final k=Buildings.Experimental.DHC.Plants.Combined.Controls.ModeCondenserLoop.tankCharge)
+  Buildings.Controls.OBC.CDL.Integers.Sources.Constant tanCha(final k=Buildings.DHC.Plants.Combined.Controls.ModeCondenserLoop.tankCharge)
     "Tank charge/discharge mode index"
     annotation (Placement(transformation(extent={{-210,190},{-190,210}})));
   Buildings.Controls.OBC.CDL.Integers.Equal isTanCha
@@ -762,7 +762,7 @@ block ValveCondenserEvaporator
   Buildings.Controls.OBC.CDL.Reals.Switch swiFloSet1[nChi + nChiHea]
     "Switch condenser flow setpoint based on condenser loop operating mode"
     annotation (Placement(transformation(extent={{-10,230},{10,250}})));
-  EnergyTransferStations.Combined.Controls.PIDWithEnable valChiWatMinByp[nChi +
+  ETS.Combined.Controls.PIDWithEnable valChiWatMinByp[nChi +
     nChiHea](
     each k=0.01,
     each Ti=Ti,
@@ -772,7 +772,7 @@ block ValveCondenserEvaporator
     each final y_reset=0,
     each final y_neutral=0) "CHW minimum flow bypass valve control"
     annotation (Placement(transformation(extent={{144,450},{164,470}})));
-  EnergyTransferStations.Combined.Controls.PIDWithEnable valHeaWatMinByp[nChiHea](
+  ETS.Combined.Controls.PIDWithEnable valHeaWatMinByp[nChiHea](
     each k=0.01,
     each Ti=Ti,
     each final yMin=0,
@@ -1384,8 +1384,8 @@ The loop is biased to launch from <i>100&nbsp;%</i>.
 <h5>Chiller evaporator flow setpoint</h5>
 <p>
 The setpoint is computed based on the logic implemented in
-<a href=\"modelica://Buildings.Experimental.DHC.Plants.Combined.Controls.BaseClasses.DirectHeatRecovery\">
-Buildings.Experimental.DHC.Plants.Combined.Controls.BaseClasses.DirectHeatRecovery</a>.
+<a href=\"modelica://Buildings.DHC.Plants.Combined.Controls.BaseClasses.DirectHeatRecovery\">
+Buildings.DHC.Plants.Combined.Controls.BaseClasses.DirectHeatRecovery</a>.
 </p>
 <h4>Chiller condenser isolation valve</h4>
 <p>
@@ -1445,8 +1445,8 @@ The loop is biased to launch from <i>100&nbsp;%</i>.
 <p>Otherwise, the valve is commanded to a closed position.</p>
 <h5>HRC evaporator flow setpoint</h5>
 <p>In direct heat recovery mode, the setpoint is reset based on the logic implemented in
-<a href=\"modelica://Buildings.Experimental.DHC.Plants.Combined.Controls.BaseClasses.DirectHeatRecovery\">
-Buildings.Experimental.DHC.Plants.Combined.Controls.BaseClasses.DirectHeatRecovery</a>.</p>
+<a href=\"modelica://Buildings.DHC.Plants.Combined.Controls.BaseClasses.DirectHeatRecovery\">
+Buildings.DHC.Plants.Combined.Controls.BaseClasses.DirectHeatRecovery</a>.</p>
 <p>In cascading heating mode, the setpoint is reset with a control loop
 that maintains the evaporator leaving temperature at target setpoint
 equal to the lowest temperature setpoint of the active tank cycle.
@@ -1492,8 +1492,8 @@ interconnection with the condenser loop (highest index) and which is operating
 in direct heat recovery mode is modulated with a control loop tracking
 the condenser entering temperature.
 The condenser entering temperature setpoint is reset based on the logic implemented in
-<a href=\"modelica://Buildings.Experimental.DHC.Plants.Combined.Controls.BaseClasses.DirectHeatRecovery\">
-Buildings.Experimental.DHC.Plants.Combined.Controls.BaseClasses.DirectHeatRecovery</a>.
+<a href=\"modelica://Buildings.DHC.Plants.Combined.Controls.BaseClasses.DirectHeatRecovery\">
+Buildings.DHC.Plants.Combined.Controls.BaseClasses.DirectHeatRecovery</a>.
 This allows false loading the HRC that is controlled to meet the HW supply
 temperature setpoint in direct heat recovery mode, and thus meeting
 the CHW supply temperature setpoint simultaneously.
diff --git a/Buildings/Experimental/DHC/Plants/Combined/Controls/BaseClasses/package.mo b/Buildings/DHC/Plants/Combined/Controls/BaseClasses/package.mo
similarity index 86%
rename from Buildings/Experimental/DHC/Plants/Combined/Controls/BaseClasses/package.mo
rename to Buildings/DHC/Plants/Combined/Controls/BaseClasses/package.mo
index 1c0fe6e412f..0731a651898 100644
--- a/Buildings/Experimental/DHC/Plants/Combined/Controls/BaseClasses/package.mo
+++ b/Buildings/DHC/Plants/Combined/Controls/BaseClasses/package.mo
@@ -1,4 +1,4 @@
-within Buildings.Experimental.DHC.Plants.Combined.Controls;
+within Buildings.DHC.Plants.Combined.Controls;
 package BaseClasses "Package with base classes"
   extends Modelica.Icons.BasesPackage;
   annotation (Documentation(info="<html>
diff --git a/Buildings/Experimental/DHC/Plants/Combined/Controls/BaseClasses/package.order b/Buildings/DHC/Plants/Combined/Controls/BaseClasses/package.order
similarity index 100%
rename from Buildings/Experimental/DHC/Plants/Combined/Controls/BaseClasses/package.order
rename to Buildings/DHC/Plants/Combined/Controls/BaseClasses/package.order
diff --git a/Buildings/Experimental/DHC/Plants/Combined/Controls/Controller.mo b/Buildings/DHC/Plants/Combined/Controls/Controller.mo
similarity index 93%
rename from Buildings/Experimental/DHC/Plants/Combined/Controls/Controller.mo
rename to Buildings/DHC/Plants/Combined/Controls/Controller.mo
index 80d71654e5d..f5bafb216af 100644
--- a/Buildings/Experimental/DHC/Plants/Combined/Controls/Controller.mo
+++ b/Buildings/DHC/Plants/Combined/Controls/Controller.mo
@@ -1,4 +1,4 @@
-within Buildings.Experimental.DHC.Plants.Combined.Controls;
+within Buildings.DHC.Plants.Combined.Controls;
 block Controller "Plant controller"
   extends BaseClasses.PartialController;
 
@@ -16,7 +16,7 @@ block Controller "Plant controller"
     final m_flow_nominal=mChiWat_flow_nominal)
     "CHW pump staging"
     annotation (Placement(transformation(extent={{120,230},{140,250}})));
-  EnergyTransferStations.Combined.Controls.PIDWithEnable pumChiWat(
+  ETS.Combined.Controls.PIDWithEnable pumChiWat(
     k=0.1,
     Ti=60,
     r=dpChiWatSet_max,
@@ -24,7 +24,7 @@ block Controller "Plant controller"
     y_neutral=0)
     "Pump speed controller"
     annotation (Placement(transformation(extent={{190,230},{210,250}})));
-  EnergyTransferStations.Combined.Controls.PIDWithEnable pumHeaWat(
+  ETS.Combined.Controls.PIDWithEnable pumHeaWat(
     k=0.1,
     Ti=60,
     r=dpHeaWatSet_max,
@@ -42,7 +42,7 @@ block Controller "Plant controller"
     final m_flow_nominal=mConWatCon_flow_nominal)
     "CW pump staging"
     annotation (Placement(transformation(extent={{120,-130},{140,-110}})));
-  EnergyTransferStations.Combined.Controls.PIDWithEnable pumConWatCon(
+  ETS.Combined.Controls.PIDWithEnable pumConWatCon(
     k=0.1,
     Ti=60,
     final r=dpConWatConSet_max,
@@ -50,7 +50,7 @@ block Controller "Plant controller"
     y_neutral=0)
     "Pump speed controller"
     annotation (Placement(transformation(extent={{190,-130},{210,-110}})));
-  EnergyTransferStations.Combined.Controls.PIDWithEnable pumConWatEva(
+  ETS.Combined.Controls.PIDWithEnable pumConWatEva(
     k=0.1,
     Ti=60,
     final r=dpConWatEvaSet_max,
@@ -102,7 +102,7 @@ block Controller "Plant controller"
     "Return true if charge assist mode is active"
     annotation (Placement(transformation(extent={{-120,-190},{-100,-170}})));
   Buildings.Controls.OBC.CDL.Integers.Sources.Constant chaAss(
-    final k=Buildings.Experimental.DHC.Plants.Combined.Controls.ModeCondenserLoop.chargeAssist)
+    final k=Buildings.DHC.Plants.Combined.Controls.ModeCondenserLoop.chargeAssist)
     "Charge assist mode index"
     annotation (Placement(transformation(extent={{-170,-198},{-150,-178}})));
   Buildings.Controls.OBC.CDL.Logical.And assAndPum
@@ -116,7 +116,7 @@ block Controller "Plant controller"
     "Extract active setpoint"
     annotation (Placement(transformation(extent={{-120,-230},{-100,-210}})));
   Buildings.Controls.OBC.CDL.Integers.Sources.Constant heaRej(
-    final k=Buildings.Experimental.DHC.Plants.Combined.Controls.ModeCondenserLoop.heatRejection)
+    final k=Buildings.DHC.Plants.Combined.Controls.ModeCondenserLoop.heatRejection)
     "Heat rejection mode index"
     annotation (Placement(transformation(extent={{-170,-290},{-150,-270}})));
   Buildings.Controls.OBC.CDL.Integers.Equal isModHeaRej
@@ -142,7 +142,7 @@ block Controller "Plant controller"
     final TTanSet=TTanSet)
     "Controller for chiller and HRC condenser and evaporator valves"
     annotation (Placement(transformation(extent={{-60,20},{-40,60}})));
-  Buildings.Experimental.DHC.Plants.Combined.Controls.BaseClasses.DirectHeatRecovery dirHeaCoo(
+  Buildings.DHC.Plants.Combined.Controls.BaseClasses.DirectHeatRecovery dirHeaCoo(
     final nChi=nChi,
     final nChiHea=nChiHea,
     final mChiWatChi_flow_nominal=mChiWatChi_flow_nominal,
@@ -470,29 +470,29 @@ This block implements the following control functions.
 <li>
 Plant heating and cooling staging and HRC operating mode selection,
 see description in
-<a href=\"modelica://Buildings.Experimental.DHC.Plants.Combined.Controls.BaseClasses.StagingPlant\">
-Buildings.Experimental.DHC.Plants.Combined.Controls.BaseClasses.StagingPlant</a>.
+<a href=\"modelica://Buildings.DHC.Plants.Combined.Controls.BaseClasses.StagingPlant\">
+Buildings.DHC.Plants.Combined.Controls.BaseClasses.StagingPlant</a>.
 </li>
 <li>
 CW loop operating mode selection, see description in
-<a href=\"modelica://Buildings.Experimental.DHC.Plants.Combined.Controls.BaseClasses.ModeCondenserLoop\">
-Buildings.Experimental.DHC.Plants.Combined.Controls.BaseClasses.ModeCondenserLoop</a>.
+<a href=\"modelica://Buildings.DHC.Plants.Combined.Controls.BaseClasses.ModeCondenserLoop\">
+Buildings.DHC.Plants.Combined.Controls.BaseClasses.ModeCondenserLoop</a>.
 </li>
 <li>
 TES tank cycle flag selection, see description in
-<a href=\"modelica://Buildings.Experimental.DHC.Plants.Combined.Controls.BaseClasses.TankCycle\">
-Buildings.Experimental.DHC.Plants.Combined.Controls.BaseClasses.TankCycle</a>.
+<a href=\"modelica://Buildings.DHC.Plants.Combined.Controls.BaseClasses.TankCycle\">
+Buildings.DHC.Plants.Combined.Controls.BaseClasses.TankCycle</a>.
 </li>
 <li>
 Load balancing, temperature and flow setpoint tracking for chillers and HRCs
 depending on active operating modes, see description in
-<a href=\"modelica://Buildings.Experimental.DHC.Plants.Combined.Controls.BaseClasses.ValveCondenserEvaporator\">
-Buildings.Experimental.DHC.Plants.Combined.Controls.BaseClasses.ValveCondenserEvaporator</a>.
+<a href=\"modelica://Buildings.DHC.Plants.Combined.Controls.BaseClasses.ValveCondenserEvaporator\">
+Buildings.DHC.Plants.Combined.Controls.BaseClasses.ValveCondenserEvaporator</a>.
 </li>
 <li>
 Cooling tower pumps and cooling tower fans control, see description in
-<a href=\"modelica://Buildings.Experimental.DHC.Plants.Combined.Controls.BaseClasses.CoolingTowerLoop\">
-Buildings.Experimental.DHC.Plants.Combined.Controls.BaseClasses.CoolingTowerLoop</a>.
+<a href=\"modelica://Buildings.DHC.Plants.Combined.Controls.BaseClasses.CoolingTowerLoop\">
+Buildings.DHC.Plants.Combined.Controls.BaseClasses.CoolingTowerLoop</a>.
 </li>
 <li>
 Air-to-water heat pump control, see below.
@@ -515,13 +515,13 @@ is taken into account.
 <h4>CHW, HW, CWE and CWC pumps</h4>
 <p>
 The lead pump is enabled based on the logic described in
-<a href=\"modelica://Buildings.Experimental.DHC.Plants.Combined.Controls.BaseClasses.ValveCondenserEvaporator\">
-Buildings.Experimental.DHC.Plants.Combined.Controls.BaseClasses.ValveCondenserEvaporator</a>.
+<a href=\"modelica://Buildings.DHC.Plants.Combined.Controls.BaseClasses.ValveCondenserEvaporator\">
+Buildings.DHC.Plants.Combined.Controls.BaseClasses.ValveCondenserEvaporator</a>.
 </p>
 <p>
 Pumps are staged based on the logic described in
-<a href=\"modelica://Buildings.Experimental.DHC.Plants.Combined.Controls.BaseClasses.StagingPump\">
-Buildings.Experimental.DHC.Plants.Combined.Controls.BaseClasses.StagingPump</a>.
+<a href=\"modelica://Buildings.DHC.Plants.Combined.Controls.BaseClasses.StagingPump\">
+Buildings.DHC.Plants.Combined.Controls.BaseClasses.StagingPump</a>.
 </p>
 <p>
 When any pump is enabled, the pump speed is modulated by a PI controller tracking
diff --git a/Buildings/Experimental/DHC/Plants/Combined/Controls/ModeCondenserLoop/package.mo b/Buildings/DHC/Plants/Combined/Controls/ModeCondenserLoop/package.mo
similarity index 87%
rename from Buildings/Experimental/DHC/Plants/Combined/Controls/ModeCondenserLoop/package.mo
rename to Buildings/DHC/Plants/Combined/Controls/ModeCondenserLoop/package.mo
index 632a3377b0e..a5967a5e3c1 100644
--- a/Buildings/Experimental/DHC/Plants/Combined/Controls/ModeCondenserLoop/package.mo
+++ b/Buildings/DHC/Plants/Combined/Controls/ModeCondenserLoop/package.mo
@@ -1,4 +1,4 @@
-within Buildings.Experimental.DHC.Plants.Combined.Controls;
+within Buildings.DHC.Plants.Combined.Controls;
 package ModeCondenserLoop "Condenser loop operating modes"
 
   constant Integer tankCharge = 1 "Tank Charge/Discharge";
diff --git a/Buildings/Experimental/DHC/Plants/Combined/Controls/ModeCondenserLoop/package.order b/Buildings/DHC/Plants/Combined/Controls/ModeCondenserLoop/package.order
similarity index 100%
rename from Buildings/Experimental/DHC/Plants/Combined/Controls/ModeCondenserLoop/package.order
rename to Buildings/DHC/Plants/Combined/Controls/ModeCondenserLoop/package.order
diff --git a/Buildings/Experimental/DHC/Plants/Combined/Controls/package.mo b/Buildings/DHC/Plants/Combined/Controls/package.mo
similarity index 83%
rename from Buildings/Experimental/DHC/Plants/Combined/Controls/package.mo
rename to Buildings/DHC/Plants/Combined/Controls/package.mo
index 75996e511f3..dc6d548a029 100644
--- a/Buildings/Experimental/DHC/Plants/Combined/Controls/package.mo
+++ b/Buildings/DHC/Plants/Combined/Controls/package.mo
@@ -1,4 +1,4 @@
-within Buildings.Experimental.DHC.Plants.Combined;
+within Buildings.DHC.Plants.Combined;
 package Controls "Package of control blocks for combined plants"
   extends Modelica.Icons.VariantsPackage;
 
diff --git a/Buildings/Experimental/DHC/Plants/Combined/Controls/package.order b/Buildings/DHC/Plants/Combined/Controls/package.order
similarity index 100%
rename from Buildings/Experimental/DHC/Plants/Combined/Controls/package.order
rename to Buildings/DHC/Plants/Combined/Controls/package.order
diff --git a/Buildings/Experimental/DHC/Plants/Combined/Examples/AllElectricCWStorage.mo b/Buildings/DHC/Plants/Combined/Examples/AllElectricCWStorage.mo
similarity index 95%
rename from Buildings/Experimental/DHC/Plants/Combined/Examples/AllElectricCWStorage.mo
rename to Buildings/DHC/Plants/Combined/Examples/AllElectricCWStorage.mo
index e061e4e23ac..21cafc9f764 100644
--- a/Buildings/Experimental/DHC/Plants/Combined/Examples/AllElectricCWStorage.mo
+++ b/Buildings/DHC/Plants/Combined/Examples/AllElectricCWStorage.mo
@@ -1,4 +1,4 @@
-within Buildings.Experimental.DHC.Plants.Combined.Examples;
+within Buildings.DHC.Plants.Combined.Examples;
 model AllElectricCWStorage
   "Validation of all-electric plant model with buildings loads"
   extends Modelica.Icons.Example;
@@ -10,8 +10,8 @@ model AllElectricCWStorage
     constrainedby Modelica.Media.Interfaces.PartialMedium
     "Medium in cooler circuit";
 
-  parameter String filNam[2]={"modelica://Buildings/Resources/Data/Experimental/DHC/Loads/Examples/MediumOffice-90.1-2010-5A.mos",
-                              "modelica://Buildings/Resources/Data/Experimental/DHC/Loads/Examples/MediumOffice-90.1-2010-5A.mos"}
+  parameter String filNam[2]={"modelica://Buildings/Resources/Data/DHC/Loads/Examples/MediumOffice-90.1-2010-5A.mos",
+                              "modelica://Buildings/Resources/Data/DHC/Loads/Examples/MediumOffice-90.1-2010-5A.mos"}
     "Path to file with timeseries loads";
   parameter Modelica.Units.SI.Temperature TSetDisSupHea = 273.15+60 "District heating supply temperature set point";
   parameter Modelica.Units.SI.Temperature TSetDisSupCoo = 273.15+6 "District cooling supply temperature set point";
@@ -73,7 +73,7 @@ model AllElectricCWStorage
     "Type of energy balance: dynamic (3 initialization options) or steady state"
     annotation(Evaluate=true, Dialog(tab = "Dynamics", group="Conservation equations"));
 
-  Buildings.Experimental.DHC.Plants.Combined.AllElectricCWStorage pla(
+  Buildings.DHC.Plants.Combined.AllElectricCWStorage pla(
     redeclare final package Medium = Medium,
     redeclare package MediumHea_b = Medium,
     redeclare final package MediumConWatCoo = MediumConWatCoo,
@@ -166,7 +166,7 @@ model AllElectricCWStorage
   Modelica.Blocks.Math.Gain norQFloCoo(k=1/sum(loaCoo.QCoo_flow_nominal))
     "Normalized Q_flow"
     annotation (Placement(transformation(extent={{-146,-190},{-126,-170}})));
-  Buildings.Experimental.DHC.Networks.Distribution2Pipe_R disHea(
+  Buildings.DHC.Networks.Distribution2Pipe_R disHea(
     redeclare final package Medium = Medium,
     nCon=2,
     allowFlowReversal=false,
@@ -178,7 +178,7 @@ model AllElectricCWStorage
     lEnd=200) "Distribution network for district heating system"
     annotation (Placement(transformation(extent={{20,62},{-20,82}})));
 
-  Buildings.Experimental.DHC.Networks.Distribution2Pipe_R disCoo(
+  Buildings.DHC.Networks.Distribution2Pipe_R disCoo(
     redeclare final package Medium = Medium,
     nCon=2,
     allowFlowReversal=false,
@@ -259,7 +259,7 @@ equation
           50},{-44,126},{20,126},{20,117},{11,117}}, color={0,0,127}));
   annotation (
     __Dymola_Commands(
-      file="modelica://Buildings/Resources/Scripts/Dymola/Experimental/DHC/Plants/Combined/Examples/AllElectricCWStorage.mos"
+      file="modelica://Buildings/Resources/Scripts/Dymola/DHC/Plants/Combined/Examples/AllElectricCWStorage.mos"
       "Simulate and plot"),
     experiment(
       StartTime=3024000,
@@ -269,8 +269,8 @@ equation
     Documentation(info="<html>
 <p>
 This model uses
-<a href=\"modelica://Buildings.Experimental.DHC.Plants.Combined.AllElectricCWStorage\">
-Buildings.Experimental.DHC.Plants.Combined.AllElectricCWStorage</a>
+<a href=\"modelica://Buildings.DHC.Plants.Combined.AllElectricCWStorage\">
+Buildings.DHC.Plants.Combined.AllElectricCWStorage</a>
 to provide heating and cooling to two identical buildings with heating and cooling
 loads provided as time series.
 </p>
diff --git a/Buildings/Experimental/DHC/Plants/Combined/Examples/package.mo b/Buildings/DHC/Plants/Combined/Examples/package.mo
similarity index 75%
rename from Buildings/Experimental/DHC/Plants/Combined/Examples/package.mo
rename to Buildings/DHC/Plants/Combined/Examples/package.mo
index c5b6b00876b..e90ff70af1d 100644
--- a/Buildings/Experimental/DHC/Plants/Combined/Examples/package.mo
+++ b/Buildings/DHC/Plants/Combined/Examples/package.mo
@@ -1,4 +1,4 @@
-within Buildings.Experimental.DHC.Plants.Combined;
+within Buildings.DHC.Plants.Combined;
 package Examples "This package holds example models using plants providing district heating and cooling"
   extends Modelica.Icons.ExamplesPackage;
 end Examples;
diff --git a/Buildings/Experimental/DHC/Plants/Combined/Examples/package.order b/Buildings/DHC/Plants/Combined/Examples/package.order
similarity index 100%
rename from Buildings/Experimental/DHC/Plants/Combined/Examples/package.order
rename to Buildings/DHC/Plants/Combined/Examples/package.order
diff --git a/Buildings/Experimental/DHC/Plants/Combined/Subsystems/BaseClasses/MultipleValves.mo b/Buildings/DHC/Plants/Combined/Subsystems/BaseClasses/MultipleValves.mo
similarity index 99%
rename from Buildings/Experimental/DHC/Plants/Combined/Subsystems/BaseClasses/MultipleValves.mo
rename to Buildings/DHC/Plants/Combined/Subsystems/BaseClasses/MultipleValves.mo
index bda0dfb66aa..b621f03bb63 100644
--- a/Buildings/Experimental/DHC/Plants/Combined/Subsystems/BaseClasses/MultipleValves.mo
+++ b/Buildings/DHC/Plants/Combined/Subsystems/BaseClasses/MultipleValves.mo
@@ -1,4 +1,4 @@
-within Buildings.Experimental.DHC.Plants.Combined.Subsystems.BaseClasses;
+within Buildings.DHC.Plants.Combined.Subsystems.BaseClasses;
 model MultipleValves
   "Parallel arrangement of identical two-way modulating valves"
   extends Buildings.Fluid.Interfaces.LumpedVolumeDeclarations(
diff --git a/Buildings/Experimental/DHC/Plants/Combined/Subsystems/BaseClasses/PartialMultiplePumps.mo b/Buildings/DHC/Plants/Combined/Subsystems/BaseClasses/PartialMultiplePumps.mo
similarity index 97%
rename from Buildings/Experimental/DHC/Plants/Combined/Subsystems/BaseClasses/PartialMultiplePumps.mo
rename to Buildings/DHC/Plants/Combined/Subsystems/BaseClasses/PartialMultiplePumps.mo
index deb11cafe87..e7ea3930c7f 100644
--- a/Buildings/Experimental/DHC/Plants/Combined/Subsystems/BaseClasses/PartialMultiplePumps.mo
+++ b/Buildings/DHC/Plants/Combined/Subsystems/BaseClasses/PartialMultiplePumps.mo
@@ -1,4 +1,4 @@
-within Buildings.Experimental.DHC.Plants.Combined.Subsystems.BaseClasses;
+within Buildings.DHC.Plants.Combined.Subsystems.BaseClasses;
 partial model PartialMultiplePumps
   "Base class for modeling multiple identical pumps in parallel"
   extends Buildings.Fluid.Interfaces.LumpedVolumeDeclarations(
@@ -132,7 +132,7 @@ partial model PartialMultiplePumps
     final allowFlowReversal=allowFlowReversal) if have_valve
     "Check valve (optional)"
     annotation (Placement(transformation(extent={{30,-10},{50,10}})));
-  PassThroughFluid pas(
+  Buildings.DHC.Plants.Combined.Subsystems.BaseClasses.PassThroughFluid pas(
     redeclare final package Medium=Medium,
     final allowFlowReversal=allowFlowReversal) if not have_valve
     "Direct fluid pass-through (case without check valve)"
@@ -243,8 +243,8 @@ equation
 This base class represents multiple identical pumps that are piped in parallel.
 An optional check valve in series with each pump is included.
 This class is used to construct the various multiple-pump models within
-<a href=\"modelica://Buildings.Experimental.DHC.Plants.Combined.Subsystems\">
-Buildings.Experimental.DHC.Plants.Combined.Subsystems</a>.
+<a href=\"modelica://Buildings.DHC.Plants.Combined.Subsystems\">
+Buildings.DHC.Plants.Combined.Subsystems</a>.
 </p>
 <h4>Details</h4>
 <p>
diff --git a/Buildings/Experimental/DHC/Plants/Combined/Subsystems/BaseClasses/PassThroughFluid.mo b/Buildings/DHC/Plants/Combined/Subsystems/BaseClasses/PassThroughFluid.mo
similarity index 91%
rename from Buildings/Experimental/DHC/Plants/Combined/Subsystems/BaseClasses/PassThroughFluid.mo
rename to Buildings/DHC/Plants/Combined/Subsystems/BaseClasses/PassThroughFluid.mo
index 8288d1ec6c7..5d9d958beba 100644
--- a/Buildings/Experimental/DHC/Plants/Combined/Subsystems/BaseClasses/PassThroughFluid.mo
+++ b/Buildings/DHC/Plants/Combined/Subsystems/BaseClasses/PassThroughFluid.mo
@@ -1,4 +1,4 @@
-within Buildings.Experimental.DHC.Plants.Combined.Subsystems.BaseClasses;
+within Buildings.DHC.Plants.Combined.Subsystems.BaseClasses;
 model PassThroughFluid "Direct fluid pass-through"
   extends Buildings.Fluid.Interfaces.PartialTwoPort;
 
diff --git a/Buildings/Experimental/DHC/Plants/Combined/Subsystems/BaseClasses/package.mo b/Buildings/DHC/Plants/Combined/Subsystems/BaseClasses/package.mo
similarity index 79%
rename from Buildings/Experimental/DHC/Plants/Combined/Subsystems/BaseClasses/package.mo
rename to Buildings/DHC/Plants/Combined/Subsystems/BaseClasses/package.mo
index 5721171cc44..2e9580168ba 100644
--- a/Buildings/Experimental/DHC/Plants/Combined/Subsystems/BaseClasses/package.mo
+++ b/Buildings/DHC/Plants/Combined/Subsystems/BaseClasses/package.mo
@@ -1,4 +1,4 @@
-within Buildings.Experimental.DHC.Plants.Combined.Subsystems;
+within Buildings.DHC.Plants.Combined.Subsystems;
 package BaseClasses "Package with base classes"
   extends Modelica.Icons.BasesPackage;
 
diff --git a/Buildings/Experimental/DHC/Plants/Combined/Subsystems/BaseClasses/package.order b/Buildings/DHC/Plants/Combined/Subsystems/BaseClasses/package.order
similarity index 100%
rename from Buildings/Experimental/DHC/Plants/Combined/Subsystems/BaseClasses/package.order
rename to Buildings/DHC/Plants/Combined/Subsystems/BaseClasses/package.order
diff --git a/Buildings/Experimental/DHC/Plants/Combined/Subsystems/ChillerGroup.mo b/Buildings/DHC/Plants/Combined/Subsystems/ChillerGroup.mo
similarity index 98%
rename from Buildings/Experimental/DHC/Plants/Combined/Subsystems/ChillerGroup.mo
rename to Buildings/DHC/Plants/Combined/Subsystems/ChillerGroup.mo
index e955a5ebb4d..a34c2240e33 100644
--- a/Buildings/Experimental/DHC/Plants/Combined/Subsystems/ChillerGroup.mo
+++ b/Buildings/DHC/Plants/Combined/Subsystems/ChillerGroup.mo
@@ -1,4 +1,4 @@
-within Buildings.Experimental.DHC.Plants.Combined.Subsystems;
+within Buildings.DHC.Plants.Combined.Subsystems;
 model ChillerGroup
   "Model of multiple identical chillers in parallel"
   extends Buildings.Fluid.Interfaces.PartialFourPortInterface(
@@ -513,8 +513,8 @@ barrel with a single instance of
 Buildings.Fluid.Chillers.ElectricReformulatedEIR</a>.
 Hydronics are resolved with mass flow rate multiplier components in
 conjunction with instances of
-<a href=\"modelica://Buildings.Experimental.DHC.Plants.Combined.Subsystems.BaseClasses.MultipleValves\">
-Buildings.Experimental.DHC.Plants.Combined.Subsystems.BaseClasses.MultipleValves</a>
+<a href=\"modelica://Buildings.DHC.Plants.Combined.Subsystems.BaseClasses.MultipleValves\">
+Buildings.DHC.Plants.Combined.Subsystems.BaseClasses.MultipleValves</a>
 which represent the parallel network of valves and fixed resistances.
 </p>
 <h5>Actuators</h5>
diff --git a/Buildings/Experimental/DHC/Plants/Combined/Subsystems/ChillerHeatRecoveryGroup.mo b/Buildings/DHC/Plants/Combined/Subsystems/ChillerHeatRecoveryGroup.mo
similarity index 99%
rename from Buildings/Experimental/DHC/Plants/Combined/Subsystems/ChillerHeatRecoveryGroup.mo
rename to Buildings/DHC/Plants/Combined/Subsystems/ChillerHeatRecoveryGroup.mo
index 764aaf1f206..ad33a442439 100644
--- a/Buildings/Experimental/DHC/Plants/Combined/Subsystems/ChillerHeatRecoveryGroup.mo
+++ b/Buildings/DHC/Plants/Combined/Subsystems/ChillerHeatRecoveryGroup.mo
@@ -1,4 +1,4 @@
-within Buildings.Experimental.DHC.Plants.Combined.Subsystems;
+within Buildings.DHC.Plants.Combined.Subsystems;
 model ChillerHeatRecoveryGroup
   "Model of multiple identical heat recovery chillers in parallel"
   extends Buildings.Fluid.Interfaces.PartialEightPortInterface(
diff --git a/Buildings/Experimental/DHC/Plants/Combined/Subsystems/CoolingTowerGroup.mo b/Buildings/DHC/Plants/Combined/Subsystems/CoolingTowerGroup.mo
similarity index 99%
rename from Buildings/Experimental/DHC/Plants/Combined/Subsystems/CoolingTowerGroup.mo
rename to Buildings/DHC/Plants/Combined/Subsystems/CoolingTowerGroup.mo
index c60857b7a34..fcdf0446189 100644
--- a/Buildings/Experimental/DHC/Plants/Combined/Subsystems/CoolingTowerGroup.mo
+++ b/Buildings/DHC/Plants/Combined/Subsystems/CoolingTowerGroup.mo
@@ -1,4 +1,4 @@
-within Buildings.Experimental.DHC.Plants.Combined.Subsystems;
+within Buildings.DHC.Plants.Combined.Subsystems;
 model CoolingTowerGroup "Model of multiple identical cooling towers in parallel"
   extends Buildings.Fluid.Interfaces.PartialTwoPortInterface(
     final m_flow_nominal(final min=Modelica.Constants.small)=mConWat_flow_nominal);
diff --git a/Buildings/Experimental/DHC/Plants/Combined/Subsystems/HeatPumpGroup.mo b/Buildings/DHC/Plants/Combined/Subsystems/HeatPumpGroup.mo
similarity index 99%
rename from Buildings/Experimental/DHC/Plants/Combined/Subsystems/HeatPumpGroup.mo
rename to Buildings/DHC/Plants/Combined/Subsystems/HeatPumpGroup.mo
index a49ae54b1a9..ae759dfc105 100644
--- a/Buildings/Experimental/DHC/Plants/Combined/Subsystems/HeatPumpGroup.mo
+++ b/Buildings/DHC/Plants/Combined/Subsystems/HeatPumpGroup.mo
@@ -1,4 +1,4 @@
-within Buildings.Experimental.DHC.Plants.Combined.Subsystems;
+within Buildings.DHC.Plants.Combined.Subsystems;
 model HeatPumpGroup
   "Model of multiple identical air-source heat pumps in parallel"
   extends Buildings.Fluid.Interfaces.PartialTwoPortInterface(
diff --git a/Buildings/Experimental/DHC/Plants/Combined/Subsystems/MultiplePumpsDp.mo b/Buildings/DHC/Plants/Combined/Subsystems/MultiplePumpsDp.mo
similarity index 88%
rename from Buildings/Experimental/DHC/Plants/Combined/Subsystems/MultiplePumpsDp.mo
rename to Buildings/DHC/Plants/Combined/Subsystems/MultiplePumpsDp.mo
index 2d252f5b79c..bfe2f374309 100644
--- a/Buildings/Experimental/DHC/Plants/Combined/Subsystems/MultiplePumpsDp.mo
+++ b/Buildings/DHC/Plants/Combined/Subsystems/MultiplePumpsDp.mo
@@ -1,4 +1,4 @@
-within Buildings.Experimental.DHC.Plants.Combined.Subsystems;
+within Buildings.DHC.Plants.Combined.Subsystems;
 model MultiplePumpsDp
   "Model of multiple identical pumps in parallel with dp-controlled pump model"
   extends BaseClasses.PartialMultiplePumps(
@@ -54,8 +54,8 @@ DI signal dedicated to each unit, with a dimensionality of one
 <h4>Details</h4>
 <p>
 See the base class
-<a href=\"modelica://Buildings.Experimental.DHC.Plants.Combined.Subsystems.BaseClasses.PartialMultiplePumps\">
-Buildings.Experimental.DHC.Plants.Combined.Subsystems.BaseClasses.PartialMultiplePumps</a>.
+<a href=\"modelica://Buildings.DHC.Plants.Combined.Subsystems.BaseClasses.PartialMultiplePumps\">
+Buildings.DHC.Plants.Combined.Subsystems.BaseClasses.PartialMultiplePumps</a>.
 for a description of the modeling approach.
 </p>
 </html>", revisions="<html>
diff --git a/Buildings/Experimental/DHC/Plants/Combined/Subsystems/MultiplePumpsFlow.mo b/Buildings/DHC/Plants/Combined/Subsystems/MultiplePumpsFlow.mo
similarity index 90%
rename from Buildings/Experimental/DHC/Plants/Combined/Subsystems/MultiplePumpsFlow.mo
rename to Buildings/DHC/Plants/Combined/Subsystems/MultiplePumpsFlow.mo
index 834fc47391e..f2b1edacc85 100644
--- a/Buildings/Experimental/DHC/Plants/Combined/Subsystems/MultiplePumpsFlow.mo
+++ b/Buildings/DHC/Plants/Combined/Subsystems/MultiplePumpsFlow.mo
@@ -1,4 +1,4 @@
-within Buildings.Experimental.DHC.Plants.Combined.Subsystems;
+within Buildings.DHC.Plants.Combined.Subsystems;
 model MultiplePumpsFlow
   "Model of multiple identical pumps in parallel with flow-controlled pump model"
   extends BaseClasses.PartialMultiplePumps(
@@ -62,8 +62,8 @@ DI signal dedicated to each unit, with a dimensionality of one
 <h4>Details</h4>
 <p>
 See the base class
-<a href=\"modelica://Buildings.Experimental.DHC.Plants.Combined.Subsystems.BaseClasses.PartialMultiplePumps\">
-Buildings.Experimental.DHC.Plants.Combined.Subsystems.BaseClasses.PartialMultiplePumps</a>.
+<a href=\"modelica://Buildings.DHC.Plants.Combined.Subsystems.BaseClasses.PartialMultiplePumps\">
+Buildings.DHC.Plants.Combined.Subsystems.BaseClasses.PartialMultiplePumps</a>.
 for a description of the modeling approach.
 </p>
 </html>", revisions="<html>
diff --git a/Buildings/Experimental/DHC/Plants/Combined/Subsystems/MultiplePumpsSpeed.mo b/Buildings/DHC/Plants/Combined/Subsystems/MultiplePumpsSpeed.mo
similarity index 84%
rename from Buildings/Experimental/DHC/Plants/Combined/Subsystems/MultiplePumpsSpeed.mo
rename to Buildings/DHC/Plants/Combined/Subsystems/MultiplePumpsSpeed.mo
index 29923e9d5a1..39b173edc5c 100644
--- a/Buildings/Experimental/DHC/Plants/Combined/Subsystems/MultiplePumpsSpeed.mo
+++ b/Buildings/DHC/Plants/Combined/Subsystems/MultiplePumpsSpeed.mo
@@ -1,8 +1,8 @@
-within Buildings.Experimental.DHC.Plants.Combined.Subsystems;
+within Buildings.DHC.Plants.Combined.Subsystems;
 model MultiplePumpsSpeed
   "Model of multiple identical pumps in parallel with speed-controlled pump model"
   extends
-    Buildings.Experimental.DHC.Plants.Combined.Subsystems.BaseClasses.PartialMultiplePumps(
+    Buildings.DHC.Plants.Combined.Subsystems.BaseClasses.PartialMultiplePumps(
     redeclare final Buildings.Fluid.Movers.SpeedControlled_y pum,
     cst(final k=1));
 
@@ -52,8 +52,8 @@ DI signal dedicated to each unit, with a dimensionality of one
 <h4>Details</h4>
 <p>
 See the base class
-<a href=\"modelica://Buildings.Experimental.DHC.Plants.Combined.Subsystems.BaseClasses.PartialMultiplePumps\">
-Buildings.Experimental.DHC.Plants.Combined.Subsystems.BaseClasses.PartialMultiplePumps</a>.
+<a href=\"modelica://Buildings.DHC.Plants.Combined.Subsystems.BaseClasses.PartialMultiplePumps\">
+Buildings.DHC.Plants.Combined.Subsystems.BaseClasses.PartialMultiplePumps</a>.
 for a description of the modeling approach.
 </p>
 </html>", revisions="<html>
diff --git a/Buildings/Experimental/DHC/Plants/Combined/Subsystems/Validation/BaseClasses/PartialMultiplePumps.mo b/Buildings/DHC/Plants/Combined/Subsystems/Validation/BaseClasses/PartialMultiplePumps.mo
similarity index 94%
rename from Buildings/Experimental/DHC/Plants/Combined/Subsystems/Validation/BaseClasses/PartialMultiplePumps.mo
rename to Buildings/DHC/Plants/Combined/Subsystems/Validation/BaseClasses/PartialMultiplePumps.mo
index ef93a3b1e9c..f3879b52704 100644
--- a/Buildings/Experimental/DHC/Plants/Combined/Subsystems/Validation/BaseClasses/PartialMultiplePumps.mo
+++ b/Buildings/DHC/Plants/Combined/Subsystems/Validation/BaseClasses/PartialMultiplePumps.mo
@@ -1,4 +1,4 @@
-within Buildings.Experimental.DHC.Plants.Combined.Subsystems.Validation.BaseClasses;
+within Buildings.DHC.Plants.Combined.Subsystems.Validation.BaseClasses;
 partial model PartialMultiplePumps
   "Base class for validating the multiple pumps model"
   extends Modelica.Icons.Example;
@@ -30,9 +30,9 @@ partial model PartialMultiplePumps
     nPorts=2)
     "Pressure boundary condition"
     annotation (Placement(transformation(extent={{-80,50},{-60,70}})));
-  replaceable Buildings.Experimental.DHC.Plants.Combined.Subsystems.MultiplePumpsSpeed pum
+  replaceable Buildings.DHC.Plants.Combined.Subsystems.MultiplePumpsSpeed pum
     constrainedby
-    Buildings.Experimental.DHC.Plants.Combined.Subsystems.BaseClasses.PartialMultiplePumps(
+    Buildings.DHC.Plants.Combined.Subsystems.BaseClasses.PartialMultiplePumps(
     redeclare final package Medium = Medium,
     final nPum=nPum,
     final mPum_flow_nominal=mPum_flow_nominal,
@@ -179,7 +179,7 @@ equation
           134,-20},{126,-20},{126,-30}}, color={0,0,127}));
   annotation (
     __Dymola_Commands(
-      file="modelica://Buildings/Resources/Scripts/Dymola/Experimental/DHC/Plants/Combined/Subsystems/Validation/MultiplePumpsSpeed.mos"
+      file="modelica://Buildings/Resources/Scripts/Dymola/DHC/Plants/Combined/Subsystems/Validation/MultiplePumpsSpeed.mos"
       "Simulate and plot"),
     experiment(
       StopTime=1000,
@@ -190,8 +190,8 @@ equation
 <p>
 This base class is used to construct validation models
 for the various multiple-pump models within
-<a href=\"modelica://Buildings.Experimental.DHC.Plants.Combined.Subsystems\">
-Buildings.Experimental.DHC.Plants.Combined.Subsystems</a>.
+<a href=\"modelica://Buildings.DHC.Plants.Combined.Subsystems\">
+Buildings.DHC.Plants.Combined.Subsystems</a>.
 </p>
 </html>", revisions="<html>
 <ul>
diff --git a/Buildings/Experimental/DHC/Plants/Combined/Subsystems/Validation/BaseClasses/package.mo b/Buildings/DHC/Plants/Combined/Subsystems/Validation/BaseClasses/package.mo
similarity index 76%
rename from Buildings/Experimental/DHC/Plants/Combined/Subsystems/Validation/BaseClasses/package.mo
rename to Buildings/DHC/Plants/Combined/Subsystems/Validation/BaseClasses/package.mo
index be31811c453..2d491cef76f 100644
--- a/Buildings/Experimental/DHC/Plants/Combined/Subsystems/Validation/BaseClasses/package.mo
+++ b/Buildings/DHC/Plants/Combined/Subsystems/Validation/BaseClasses/package.mo
@@ -1,4 +1,4 @@
-within Buildings.Experimental.DHC.Plants.Combined.Subsystems.Validation;
+within Buildings.DHC.Plants.Combined.Subsystems.Validation;
 package BaseClasses "Package with base classes"
   extends Modelica.Icons.BasesPackage;
 
diff --git a/Buildings/Experimental/DHC/Plants/Combined/Subsystems/Validation/BaseClasses/package.order b/Buildings/DHC/Plants/Combined/Subsystems/Validation/BaseClasses/package.order
similarity index 100%
rename from Buildings/Experimental/DHC/Plants/Combined/Subsystems/Validation/BaseClasses/package.order
rename to Buildings/DHC/Plants/Combined/Subsystems/Validation/BaseClasses/package.order
diff --git a/Buildings/Experimental/DHC/Plants/Combined/Subsystems/Validation/ChillerGroup.mo b/Buildings/DHC/Plants/Combined/Subsystems/Validation/ChillerGroup.mo
similarity index 91%
rename from Buildings/Experimental/DHC/Plants/Combined/Subsystems/Validation/ChillerGroup.mo
rename to Buildings/DHC/Plants/Combined/Subsystems/Validation/ChillerGroup.mo
index 82f8c341a74..7b12d666abf 100644
--- a/Buildings/Experimental/DHC/Plants/Combined/Subsystems/Validation/ChillerGroup.mo
+++ b/Buildings/DHC/Plants/Combined/Subsystems/Validation/ChillerGroup.mo
@@ -1,4 +1,4 @@
-within Buildings.Experimental.DHC.Plants.Combined.Subsystems.Validation;
+within Buildings.DHC.Plants.Combined.Subsystems.Validation;
 model ChillerGroup "Validation of chiller group model"
   extends Modelica.Icons.Example;
 
@@ -14,7 +14,7 @@ model ChillerGroup "Validation of chiller group model"
     dat "Chiller parameters"
     annotation (Placement(transformation(extent={{90,92},{110,112}})));
 
-  Buildings.Experimental.DHC.Plants.Combined.Subsystems.ChillerGroup chi(
+  Buildings.DHC.Plants.Combined.Subsystems.ChillerGroup chi(
     redeclare final package Medium1 = MediumConWat,
     redeclare final package Medium2 = MediumChiWat,
     show_T=true,
@@ -99,7 +99,7 @@ equation
           -40,-20},{-5.8,-20},{-5.8,-12}}, color={0,0,127}));
   annotation (
     __Dymola_Commands(
-      file="modelica://Buildings/Resources/Scripts/Dymola/Experimental/DHC/Plants/Combined/Subsystems/Validation/ChillerGroup.mos"
+      file="modelica://Buildings/Resources/Scripts/Dymola/DHC/Plants/Combined/Subsystems/Validation/ChillerGroup.mos"
       "Simulate and plot"),
     experiment(
       StopTime=1000,
@@ -108,8 +108,8 @@ equation
     Documentation(info="<html>
 <p>
 This model validates
-<a href=\"modelica://Buildings.Experimental.DHC.Plants.Combined.Subsystems.ChillerGroup\">
-Buildings.Experimental.DHC.Plants.Combined.Subsystems.ChillerGroup</a>
+<a href=\"modelica://Buildings.DHC.Plants.Combined.Subsystems.ChillerGroup\">
+Buildings.DHC.Plants.Combined.Subsystems.ChillerGroup</a>
 in a configuration with two chillers.
 The chillers are initially On and they are switched Off one after the other
 as they receive an increasing CHW supply temperature setpoint.
diff --git a/Buildings/Experimental/DHC/Plants/Combined/Subsystems/Validation/ChillerHeatRecoveryGroup.mo b/Buildings/DHC/Plants/Combined/Subsystems/Validation/ChillerHeatRecoveryGroup.mo
similarity index 96%
rename from Buildings/Experimental/DHC/Plants/Combined/Subsystems/Validation/ChillerHeatRecoveryGroup.mo
rename to Buildings/DHC/Plants/Combined/Subsystems/Validation/ChillerHeatRecoveryGroup.mo
index 94189087a8b..c578c4b6b68 100644
--- a/Buildings/Experimental/DHC/Plants/Combined/Subsystems/Validation/ChillerHeatRecoveryGroup.mo
+++ b/Buildings/DHC/Plants/Combined/Subsystems/Validation/ChillerHeatRecoveryGroup.mo
@@ -1,4 +1,4 @@
-within Buildings.Experimental.DHC.Plants.Combined.Subsystems.Validation;
+within Buildings.DHC.Plants.Combined.Subsystems.Validation;
 model ChillerHeatRecoveryGroup
   "Validation of heat recovery chiller group model"
   extends Modelica.Icons.Example;
@@ -30,7 +30,7 @@ model ChillerHeatRecoveryGroup
       Dialog(group="CHW loop and cooling-only chillers"),
       Placement(transformation(extent={{140,200},{160,220}})));
 
-  Buildings.Experimental.DHC.Plants.Combined.Subsystems.ChillerHeatRecoveryGroup
+  Buildings.DHC.Plants.Combined.Subsystems.ChillerHeatRecoveryGroup
     chi(
     redeclare final package Medium = Medium,
     show_T=true,
@@ -174,7 +174,7 @@ model ChillerHeatRecoveryGroup
       each final k=chi.THeaWatSup_nominal, y(each final unit="K", each
         displayUnit="degC")) "Supply temperature setpoint"
     annotation (Placement(transformation(extent={{-240,-230},{-220,-210}})));
-  Buildings.Experimental.DHC.Plants.Combined.Subsystems.MultiplePumpsSpeed pumChiWat(
+  Buildings.DHC.Plants.Combined.Subsystems.MultiplePumpsSpeed pumChiWat(
     redeclare package Medium = Medium,
     energyDynamics=Modelica.Fluid.Types.Dynamics.FixedInitial,
     nPum=1,
@@ -190,7 +190,7 @@ model ChillerHeatRecoveryGroup
         extent={{-10,-10},{10,10}},
         rotation=0,
         origin={-30,140})));
-  Buildings.Experimental.DHC.Plants.Combined.Subsystems.MultiplePumpsSpeed pumHeaWat(
+  Buildings.DHC.Plants.Combined.Subsystems.MultiplePumpsSpeed pumHeaWat(
     redeclare package Medium = Medium,
     energyDynamics=Modelica.Fluid.Types.Dynamics.FixedInitial,
     nPum=1,
@@ -213,7 +213,7 @@ model ChillerHeatRecoveryGroup
         extent={{-10,-10},{10,10}},
         rotation=0,
         origin={-30,60})));
-  Buildings.Experimental.DHC.Plants.Combined.Subsystems.MultiplePumpsSpeed pumConWatCon(
+  Buildings.DHC.Plants.Combined.Subsystems.MultiplePumpsSpeed pumConWatCon(
     redeclare package Medium = Medium,
     energyDynamics=Modelica.Fluid.Types.Dynamics.FixedInitial,
     nPum=1,
@@ -225,7 +225,7 @@ model ChillerHeatRecoveryGroup
         extent={{10,-10},{-10,10}},
         rotation=0,
         origin={130,160})));
-  Buildings.Experimental.DHC.Plants.Combined.Subsystems.MultiplePumpsSpeed pumConWatEva(
+  Buildings.DHC.Plants.Combined.Subsystems.MultiplePumpsSpeed pumConWatEva(
     redeclare package Medium = Medium,
     energyDynamics=Modelica.Fluid.Types.Dynamics.FixedInitial,
     nPum=1,
@@ -452,7 +452,7 @@ equation
           {116,40},{116,20},{120,20}}, color={0,127,255}));
   annotation (
     __Dymola_Commands(
-      file="modelica://Buildings/Resources/Scripts/Dymola/Experimental/DHC/Plants/Combined/Subsystems/Validation/ChillerHeatRecoveryGroup.mos"
+      file="modelica://Buildings/Resources/Scripts/Dymola/DHC/Plants/Combined/Subsystems/Validation/ChillerHeatRecoveryGroup.mos"
       "Simulate and plot"),
     experiment(
       StopTime=2000,
@@ -461,8 +461,8 @@ equation
     Documentation(info="<html>
 <p>
 This model validates
-<a href=\"modelica://Buildings.Experimental.DHC.Plants.Combined.Subsystems.ChillerHeatRecoveryGroup\">
-Buildings.Experimental.DHC.Plants.Combined.Subsystems.ChillerHeatRecoveryGroup</a>
+<a href=\"modelica://Buildings.DHC.Plants.Combined.Subsystems.ChillerHeatRecoveryGroup\">
+Buildings.DHC.Plants.Combined.Subsystems.ChillerHeatRecoveryGroup</a>
 in a configuration with two HRCs.
 </p>
 </html>", revisions="<html>
diff --git a/Buildings/Experimental/DHC/Plants/Combined/Subsystems/Validation/CoolingTowerGroup.mo b/Buildings/DHC/Plants/Combined/Subsystems/Validation/CoolingTowerGroup.mo
similarity index 89%
rename from Buildings/Experimental/DHC/Plants/Combined/Subsystems/Validation/CoolingTowerGroup.mo
rename to Buildings/DHC/Plants/Combined/Subsystems/Validation/CoolingTowerGroup.mo
index 1b53f070580..4ed9491bc58 100644
--- a/Buildings/Experimental/DHC/Plants/Combined/Subsystems/Validation/CoolingTowerGroup.mo
+++ b/Buildings/DHC/Plants/Combined/Subsystems/Validation/CoolingTowerGroup.mo
@@ -1,4 +1,4 @@
-within Buildings.Experimental.DHC.Plants.Combined.Subsystems.Validation;
+within Buildings.DHC.Plants.Combined.Subsystems.Validation;
 model CoolingTowerGroup "Validation of cooling tower group model"
   extends Modelica.Icons.Example;
 
@@ -6,7 +6,7 @@ model CoolingTowerGroup "Validation of cooling tower group model"
     constrainedby Modelica.Media.Interfaces.PartialMedium
     "CW medium";
 
-  Buildings.Experimental.DHC.Plants.Combined.Subsystems.CoolingTowerGroup coo(
+  Buildings.DHC.Plants.Combined.Subsystems.CoolingTowerGroup coo(
     redeclare final package Medium = MediumConWat,
     show_T=true,
     nUni=2,
@@ -69,12 +69,12 @@ model CoolingTowerGroup "Validation of cooling tower group model"
         extent={{-10,-10},{10,10}},
         rotation=90,
         origin={-60,-40})));
-  EnergyTransferStations.Combined.Controls.PIDWithEnable ctl(
+  ETS.Combined.Controls.PIDWithEnable ctl(
     k=1,
     Ti=60,
     reverseActing=false) "Controller"
     annotation (Placement(transformation(extent={{-10,50},{10,70}})));
-  Buildings.Experimental.DHC.Plants.Combined.Subsystems.MultiplePumpsSpeed pum(
+  Buildings.DHC.Plants.Combined.Subsystems.MultiplePumpsSpeed pum(
     redeclare package Medium =MediumConWat,
     energyDynamics=Modelica.Fluid.Types.Dynamics.FixedInitial,
     final nPum=coo.nUni,
@@ -114,7 +114,7 @@ equation
         color={255,0,255}));
   annotation (
     __Dymola_Commands(
-      file="modelica://Buildings/Resources/Scripts/Dymola/Experimental/DHC/Plants/Combined/Subsystems/Validation/CoolingTowerGroup.mos"
+      file="modelica://Buildings/Resources/Scripts/Dymola/DHC/Plants/Combined/Subsystems/Validation/CoolingTowerGroup.mos"
       "Simulate and plot"),
     experiment(
       StopTime=1000,
@@ -123,8 +123,8 @@ equation
     Documentation(info="<html>
 <p>
 This model validates
-<a href=\"modelica://Buildings.Experimental.DHC.Plants.Combined.Subsystems.CoolingTowerGroup\">
-Buildings.Experimental.DHC.Plants.Combined.Subsystems.CoolingTowerGroup</a>
+<a href=\"modelica://Buildings.DHC.Plants.Combined.Subsystems.CoolingTowerGroup\">
+Buildings.DHC.Plants.Combined.Subsystems.CoolingTowerGroup</a>
 in a configuration with two tower cells.
 The tower cells are initially enabled and they are disabled one after the other
 as the CW supply temperature setpoint is increasing after an initial
diff --git a/Buildings/Experimental/DHC/Plants/Combined/Subsystems/Validation/HeatPumpGroup.mo b/Buildings/DHC/Plants/Combined/Subsystems/Validation/HeatPumpGroup.mo
similarity index 91%
rename from Buildings/Experimental/DHC/Plants/Combined/Subsystems/Validation/HeatPumpGroup.mo
rename to Buildings/DHC/Plants/Combined/Subsystems/Validation/HeatPumpGroup.mo
index 6534df7a8cb..4725caffcd5 100644
--- a/Buildings/Experimental/DHC/Plants/Combined/Subsystems/Validation/HeatPumpGroup.mo
+++ b/Buildings/DHC/Plants/Combined/Subsystems/Validation/HeatPumpGroup.mo
@@ -1,4 +1,4 @@
-within Buildings.Experimental.DHC.Plants.Combined.Subsystems.Validation;
+within Buildings.DHC.Plants.Combined.Subsystems.Validation;
 model HeatPumpGroup "Validation of heat pump group model"
   extends Modelica.Icons.Example;
 
@@ -33,7 +33,7 @@ model HeatPumpGroup "Validation of heat pump group model"
     "Heat pump parameters (each unit)"
     annotation (Placement(transformation(extent={{90,92},{110,112}})));
 
-  Buildings.Experimental.DHC.Plants.Combined.Subsystems.HeatPumpGroup heaPum(
+  Buildings.DHC.Plants.Combined.Subsystems.HeatPumpGroup heaPum(
     redeclare final package Medium = MediumHeaWat,
     redeclare final package MediumAir = MediumAir,
     show_T=true,
@@ -116,7 +116,7 @@ equation
     annotation (Line(points={{-20,-30},{-20,0},{-10,0}}, color={0,127,255}));
   annotation (
     __Dymola_Commands(
-      file="modelica://Buildings/Resources/Scripts/Dymola/Experimental/DHC/Plants/Combined/Subsystems/Validation/HeatPumpGroup.mos"
+      file="modelica://Buildings/Resources/Scripts/Dymola/DHC/Plants/Combined/Subsystems/Validation/HeatPumpGroup.mos"
       "Simulate and plot"),
     experiment(
       StopTime=1000,
@@ -125,8 +125,8 @@ equation
     Documentation(info="<html>
 <p>
 This model validates
-<a href=\"modelica://Buildings.Experimental.DHC.Plants.Combined.Subsystems.HeatPumpGroup\">
-Buildings.Experimental.DHC.Plants.Combined.Subsystems.HeatPumpGroup</a>
+<a href=\"modelica://Buildings.DHC.Plants.Combined.Subsystems.HeatPumpGroup\">
+Buildings.DHC.Plants.Combined.Subsystems.HeatPumpGroup</a>
 in a configuration with two heat pumps.
 The heat pumps are initially On and they are switched Off one after the other
 as they are exposed to an increasing HW return temperature.
diff --git a/Buildings/Experimental/DHC/Plants/Combined/Subsystems/Validation/MultiplePumpsDp.mo b/Buildings/DHC/Plants/Combined/Subsystems/Validation/MultiplePumpsDp.mo
similarity index 82%
rename from Buildings/Experimental/DHC/Plants/Combined/Subsystems/Validation/MultiplePumpsDp.mo
rename to Buildings/DHC/Plants/Combined/Subsystems/Validation/MultiplePumpsDp.mo
index 3fa740c7a1e..e2a595f38c0 100644
--- a/Buildings/Experimental/DHC/Plants/Combined/Subsystems/Validation/MultiplePumpsDp.mo
+++ b/Buildings/DHC/Plants/Combined/Subsystems/Validation/MultiplePumpsDp.mo
@@ -1,8 +1,8 @@
-within Buildings.Experimental.DHC.Plants.Combined.Subsystems.Validation;
+within Buildings.DHC.Plants.Combined.Subsystems.Validation;
 model MultiplePumpsDp
   "Validation of multiple pumps model with dp-controlled pump model"
   extends BaseClasses.PartialMultiplePumps(
-    redeclare final Subsystems.MultiplePumpsDp pum,
+    redeclare final Buildings.DHC.Plants.Combined.Subsystems.MultiplePumpsDp pum,
     redeclare final Buildings.Fluid.Movers.FlowControlled_dp pum1(
       final m_flow_nominal=mPum_flow_nominal,
       final dp_nominal=dpPum_nominal),
@@ -27,7 +27,7 @@ equation
           {-12,64}}, color={0,0,127}));
   annotation (
     __Dymola_Commands(
-      file="modelica://Buildings/Resources/Scripts/Dymola/Experimental/DHC/Plants/Combined/Subsystems/Validation/MultiplePumpsDp.mos"
+      file="modelica://Buildings/Resources/Scripts/Dymola/DHC/Plants/Combined/Subsystems/Validation/MultiplePumpsDp.mos"
       "Simulate and plot"),
     experiment(
       StopTime=1000,
@@ -37,8 +37,8 @@ equation
     Documentation(info="<html>
 <p>
 This model validates
-<a href=\"modelica://Buildings.Experimental.DHC.Plants.Combined.Subsystems.MultiplePumpsDp\">
-Buildings.Experimental.DHC.Plants.Combined.Subsystems.MultiplePumpsDp</a>
+<a href=\"modelica://Buildings.DHC.Plants.Combined.Subsystems.MultiplePumpsDp\">
+Buildings.DHC.Plants.Combined.Subsystems.MultiplePumpsDp</a>
 by comparing an instance of that model with two instances of
 <a href=\"modelica://Buildings.Fluid.Movers.FlowControlled_dp\">
 Buildings.Fluid.Movers.FlowControlled_dp</a>
diff --git a/Buildings/Experimental/DHC/Plants/Combined/Subsystems/Validation/MultiplePumpsFlow.mo b/Buildings/DHC/Plants/Combined/Subsystems/Validation/MultiplePumpsFlow.mo
similarity index 85%
rename from Buildings/Experimental/DHC/Plants/Combined/Subsystems/Validation/MultiplePumpsFlow.mo
rename to Buildings/DHC/Plants/Combined/Subsystems/Validation/MultiplePumpsFlow.mo
index 58ebe2f8277..5149514b6bf 100644
--- a/Buildings/Experimental/DHC/Plants/Combined/Subsystems/Validation/MultiplePumpsFlow.mo
+++ b/Buildings/DHC/Plants/Combined/Subsystems/Validation/MultiplePumpsFlow.mo
@@ -1,8 +1,8 @@
-within Buildings.Experimental.DHC.Plants.Combined.Subsystems.Validation;
+within Buildings.DHC.Plants.Combined.Subsystems.Validation;
 model MultiplePumpsFlow
   "Validation of multiple pumps model with flow-controlled pump model"
   extends BaseClasses.PartialMultiplePumps(
-    redeclare final Subsystems.MultiplePumpsFlow pum,
+    redeclare final Buildings.DHC.Plants.Combined.Subsystems.MultiplePumpsFlow pum,
     redeclare final Buildings.Fluid.Movers.FlowControlled_m_flow pum1(
       final m_flow_nominal=mPum_flow_nominal,
       final dp_nominal=dpPum_nominal),
@@ -36,7 +36,7 @@ equation
           74,-60},{74,-12}}, color={0,0,127}));
   annotation (
     __Dymola_Commands(
-      file="modelica://Buildings/Resources/Scripts/Dymola/Experimental/DHC/Plants/Combined/Subsystems/Validation/MultiplePumpsFlow.mos"
+      file="modelica://Buildings/Resources/Scripts/Dymola/DHC/Plants/Combined/Subsystems/Validation/MultiplePumpsFlow.mos"
       "Simulate and plot"),
     experiment(
       StopTime=1000,
@@ -46,8 +46,8 @@ equation
     Documentation(info="<html>
 <p>
 This model validates
-<a href=\"modelica://Buildings.Experimental.DHC.Plants.Combined.Subsystems.MultiplePumpsFlow\">
-Buildings.Experimental.DHC.Plants.Combined.Subsystems.MultiplePumpsFlow</a>
+<a href=\"modelica://Buildings.DHC.Plants.Combined.Subsystems.MultiplePumpsFlow\">
+Buildings.DHC.Plants.Combined.Subsystems.MultiplePumpsFlow</a>
 by comparing an instance of that model with two instances of
 <a href=\"modelica://Buildings.Fluid.Movers.FlowControlled_m_flow\">
 Buildings.Fluid.Movers.FlowControlled_m_flow</a>
diff --git a/Buildings/Experimental/DHC/Plants/Combined/Subsystems/Validation/MultiplePumpsSpeed.mo b/Buildings/DHC/Plants/Combined/Subsystems/Validation/MultiplePumpsSpeed.mo
similarity index 80%
rename from Buildings/Experimental/DHC/Plants/Combined/Subsystems/Validation/MultiplePumpsSpeed.mo
rename to Buildings/DHC/Plants/Combined/Subsystems/Validation/MultiplePumpsSpeed.mo
index 1d94cc90eb2..15cffc337f1 100644
--- a/Buildings/Experimental/DHC/Plants/Combined/Subsystems/Validation/MultiplePumpsSpeed.mo
+++ b/Buildings/DHC/Plants/Combined/Subsystems/Validation/MultiplePumpsSpeed.mo
@@ -1,8 +1,8 @@
-within Buildings.Experimental.DHC.Plants.Combined.Subsystems.Validation;
+within Buildings.DHC.Plants.Combined.Subsystems.Validation;
 model MultiplePumpsSpeed
   "Validation of multiple pumps model with speed-controlled pump model"
   extends BaseClasses.PartialMultiplePumps(
-    redeclare final Subsystems.MultiplePumpsSpeed pum,
+    redeclare final Buildings.DHC.Plants.Combined.Subsystems.MultiplePumpsSpeed pum,
     redeclare final Fluid.Movers.SpeedControlled_y pum1,
     redeclare final Fluid.Movers.SpeedControlled_y pum2);
 
@@ -22,7 +22,7 @@ equation
           {0,-68}}, color={0,0,127}));
   annotation (
     __Dymola_Commands(
-      file="modelica://Buildings/Resources/Scripts/Dymola/Experimental/DHC/Plants/Combined/Subsystems/Validation/MultiplePumpsSpeed.mos"
+      file="modelica://Buildings/Resources/Scripts/Dymola/DHC/Plants/Combined/Subsystems/Validation/MultiplePumpsSpeed.mos"
       "Simulate and plot"),
     experiment(
       StopTime=1000,
@@ -32,8 +32,8 @@ equation
     Documentation(info="<html>
 <p>
 This model validates
-<a href=\"modelica://Buildings.Experimental.DHC.Plants.Combined.Subsystems.MultiplePumpsSpeed\">
-Buildings.Experimental.DHC.Plants.Combined.Subsystems.MultiplePumpsSpeed</a>
+<a href=\"modelica://Buildings.DHC.Plants.Combined.Subsystems.MultiplePumpsSpeed\">
+Buildings.DHC.Plants.Combined.Subsystems.MultiplePumpsSpeed</a>
 by comparing an instance of that model with two instances of
 <a href=\"modelica://Buildings.Fluid.Movers.SpeedControlled_y\">
 Buildings.Fluid.Movers.SpeedControlled_y</a>
diff --git a/Buildings/Experimental/DHC/Plants/Combined/Subsystems/Validation/ValveOpeningFlowBalancing.mo b/Buildings/DHC/Plants/Combined/Subsystems/Validation/ValveOpeningFlowBalancing.mo
similarity index 94%
rename from Buildings/Experimental/DHC/Plants/Combined/Subsystems/Validation/ValveOpeningFlowBalancing.mo
rename to Buildings/DHC/Plants/Combined/Subsystems/Validation/ValveOpeningFlowBalancing.mo
index ed84d121851..5b3ea86e6f5 100644
--- a/Buildings/Experimental/DHC/Plants/Combined/Subsystems/Validation/ValveOpeningFlowBalancing.mo
+++ b/Buildings/DHC/Plants/Combined/Subsystems/Validation/ValveOpeningFlowBalancing.mo
@@ -1,4 +1,4 @@
-within Buildings.Experimental.DHC.Plants.Combined.Subsystems.Validation;
+within Buildings.DHC.Plants.Combined.Subsystems.Validation;
 model ValveOpeningFlowBalancing
   "Validation model for the computation of the valve opening ensuring flow balancing"
   extends Modelica.Icons.Example;
@@ -72,7 +72,7 @@ equation
           0,-20},{0,-28}}, color={0,0,127}));
   annotation (
     __Dymola_Commands(
-      file="modelica://Buildings/Resources/Scripts/Dymola/Experimental/DHC/Plants/Combined/Subsystems/Validation/ValveOpeningFlowBalancing.mos"
+      file="modelica://Buildings/Resources/Scripts/Dymola/DHC/Plants/Combined/Subsystems/Validation/ValveOpeningFlowBalancing.mos"
       "Simulate and plot"),
     experiment(
       StopTime=1,
diff --git a/Buildings/Experimental/DHC/Plants/Combined/Subsystems/Validation/package.mo b/Buildings/DHC/Plants/Combined/Subsystems/Validation/package.mo
similarity index 77%
rename from Buildings/Experimental/DHC/Plants/Combined/Subsystems/Validation/package.mo
rename to Buildings/DHC/Plants/Combined/Subsystems/Validation/package.mo
index 72c90cfbbbb..096eff30a95 100644
--- a/Buildings/Experimental/DHC/Plants/Combined/Subsystems/Validation/package.mo
+++ b/Buildings/DHC/Plants/Combined/Subsystems/Validation/package.mo
@@ -1,4 +1,4 @@
-within Buildings.Experimental.DHC.Plants.Combined.Subsystems;
+within Buildings.DHC.Plants.Combined.Subsystems;
 package Validation "Package with validation models"
   extends Modelica.Icons.ExamplesPackage;
 
diff --git a/Buildings/Experimental/DHC/Plants/Combined/Subsystems/Validation/package.order b/Buildings/DHC/Plants/Combined/Subsystems/Validation/package.order
similarity index 100%
rename from Buildings/Experimental/DHC/Plants/Combined/Subsystems/Validation/package.order
rename to Buildings/DHC/Plants/Combined/Subsystems/Validation/package.order
diff --git a/Buildings/Experimental/DHC/Plants/Combined/Subsystems/package.mo b/Buildings/DHC/Plants/Combined/Subsystems/package.mo
similarity index 84%
rename from Buildings/Experimental/DHC/Plants/Combined/Subsystems/package.mo
rename to Buildings/DHC/Plants/Combined/Subsystems/package.mo
index 07c16cf9777..dae1b6795fb 100644
--- a/Buildings/Experimental/DHC/Plants/Combined/Subsystems/package.mo
+++ b/Buildings/DHC/Plants/Combined/Subsystems/package.mo
@@ -1,4 +1,4 @@
-within Buildings.Experimental.DHC.Plants.Combined;
+within Buildings.DHC.Plants.Combined;
 package Subsystems "Package of models for subsystems of combined plants"
   extends Modelica.Icons.VariantsPackage;
 
diff --git a/Buildings/Experimental/DHC/Plants/Combined/Subsystems/package.order b/Buildings/DHC/Plants/Combined/Subsystems/package.order
similarity index 100%
rename from Buildings/Experimental/DHC/Plants/Combined/Subsystems/package.order
rename to Buildings/DHC/Plants/Combined/Subsystems/package.order
diff --git a/Buildings/Experimental/DHC/Plants/Combined/Validation/AllElectricCWStorage.mo b/Buildings/DHC/Plants/Combined/Validation/AllElectricCWStorage.mo
similarity index 96%
rename from Buildings/Experimental/DHC/Plants/Combined/Validation/AllElectricCWStorage.mo
rename to Buildings/DHC/Plants/Combined/Validation/AllElectricCWStorage.mo
index d2a6b6140c5..2eba202eae4 100644
--- a/Buildings/Experimental/DHC/Plants/Combined/Validation/AllElectricCWStorage.mo
+++ b/Buildings/DHC/Plants/Combined/Validation/AllElectricCWStorage.mo
@@ -1,4 +1,4 @@
-within Buildings.Experimental.DHC.Plants.Combined.Validation;
+within Buildings.DHC.Plants.Combined.Validation;
 model AllElectricCWStorage "Validation of all-electric plant model"
   extends Modelica.Icons.Example;
 
@@ -67,7 +67,7 @@ model AllElectricCWStorage "Validation of all-electric plant model"
     "Type of energy balance: dynamic (3 initialization options) or steady state"
     annotation(Evaluate=true, Dialog(tab = "Dynamics", group="Conservation equations"));
 
-  Buildings.Experimental.DHC.Plants.Combined.AllElectricCWStorage pla(
+  Buildings.DHC.Plants.Combined.AllElectricCWStorage pla(
     redeclare final package Medium = Medium,
     redeclare package MediumHea_b = Medium,
     redeclare final package MediumConWatCoo = MediumConWatCoo,
@@ -208,7 +208,7 @@ equation
           24},{-34,24}}, color={255,0,255}));
   annotation (
     __Dymola_Commands(
-      file="modelica://Buildings/Resources/Scripts/Dymola/Experimental/DHC/Plants/Combined/Validation/AllElectricCWStorage.mos"
+      file="modelica://Buildings/Resources/Scripts/Dymola/DHC/Plants/Combined/Validation/AllElectricCWStorage.mos"
       "Simulate and plot"),
     experiment(
       StopTime=345600,
@@ -217,8 +217,8 @@ equation
     Documentation(info="<html>
 <p>
 This model validates
-<a href=\"modelica://Buildings.Experimental.DHC.Plants.Combined.AllElectricCWStorage\">
-Buildings.Experimental.DHC.Plants.Combined.AllElectricCWStorage</a>
+<a href=\"modelica://Buildings.DHC.Plants.Combined.AllElectricCWStorage\">
+Buildings.DHC.Plants.Combined.AllElectricCWStorage</a>
 over a four-day simulation period where the load profile is characterized by
 high cooling loads and low heating loads during the first day,
 concomitant high cooling and heating loads during the second day,
diff --git a/Buildings/Experimental/DHC/Plants/Combined/Validation/package.mo b/Buildings/DHC/Plants/Combined/Validation/package.mo
similarity index 80%
rename from Buildings/Experimental/DHC/Plants/Combined/Validation/package.mo
rename to Buildings/DHC/Plants/Combined/Validation/package.mo
index a708d489d62..dc17d159474 100644
--- a/Buildings/Experimental/DHC/Plants/Combined/Validation/package.mo
+++ b/Buildings/DHC/Plants/Combined/Validation/package.mo
@@ -1,4 +1,4 @@
-within Buildings.Experimental.DHC.Plants.Combined;
+within Buildings.DHC.Plants.Combined;
 package Validation "Package with validation models"
   extends Modelica.Icons.ExamplesPackage;
 
diff --git a/Buildings/Experimental/DHC/Plants/Combined/Validation/package.order b/Buildings/DHC/Plants/Combined/Validation/package.order
similarity index 100%
rename from Buildings/Experimental/DHC/Plants/Combined/Validation/package.order
rename to Buildings/DHC/Plants/Combined/Validation/package.order
diff --git a/Buildings/Experimental/DHC/Plants/Combined/package.mo b/Buildings/DHC/Plants/Combined/package.mo
similarity index 87%
rename from Buildings/Experimental/DHC/Plants/Combined/package.mo
rename to Buildings/DHC/Plants/Combined/package.mo
index d58f0974d94..20e7613ab18 100644
--- a/Buildings/Experimental/DHC/Plants/Combined/package.mo
+++ b/Buildings/DHC/Plants/Combined/package.mo
@@ -1,4 +1,4 @@
-within Buildings.Experimental.DHC.Plants;
+within Buildings.DHC.Plants;
 package Combined "Package of models for central plants that provide heating and cooling"
   extends Modelica.Icons.VariantsPackage;
 
diff --git a/Buildings/Experimental/DHC/Plants/Combined/package.order b/Buildings/DHC/Plants/Combined/package.order
similarity index 100%
rename from Buildings/Experimental/DHC/Plants/Combined/package.order
rename to Buildings/DHC/Plants/Combined/package.order
diff --git a/Buildings/Experimental/DHC/Plants/Cooling/BaseClasses/IdealUser.mo b/Buildings/DHC/Plants/Cooling/BaseClasses/IdealUser.mo
similarity index 96%
rename from Buildings/Experimental/DHC/Plants/Cooling/BaseClasses/IdealUser.mo
rename to Buildings/DHC/Plants/Cooling/BaseClasses/IdealUser.mo
index 96e1e39cfec..c72266210b0 100644
--- a/Buildings/Experimental/DHC/Plants/Cooling/BaseClasses/IdealUser.mo
+++ b/Buildings/DHC/Plants/Cooling/BaseClasses/IdealUser.mo
@@ -1,4 +1,4 @@
-within Buildings.Experimental.DHC.Plants.Cooling.BaseClasses;
+within Buildings.DHC.Plants.Cooling.BaseClasses;
 model IdealUser "Ideal user model"
   replaceable package Medium =
     Modelica.Media.Interfaces.PartialMedium "Medium package";
@@ -132,8 +132,8 @@ equation
                                  Documentation(info="<html>
 <p>
 This is a simple ideal user model used by
-<a href=\"Modelica://Buildings.Experimental.DHC.Plants.Cooling.Examples.StoragePlantDualSource\">
-Buildings.Experimental.DHC.Plants.Cooling.Examples.StoragePlantDualSource</a>.
+<a href=\"Modelica://Buildings.DHC.Plants.Cooling.Examples.StoragePlantDualSource\">
+Buildings.DHC.Plants.Cooling.Examples.StoragePlantDualSource</a>.
 The load of the user is described by a varying mass flow rate setpoint.
 The valve is controlled to maintain the requested mass flow rate.
 The model sets its leaving water temperature to the user-specified temperature
diff --git a/Buildings/Experimental/DHC/Plants/Cooling/BaseClasses/ParallelJunctions.mo b/Buildings/DHC/Plants/Cooling/BaseClasses/ParallelJunctions.mo
similarity index 99%
rename from Buildings/Experimental/DHC/Plants/Cooling/BaseClasses/ParallelJunctions.mo
rename to Buildings/DHC/Plants/Cooling/BaseClasses/ParallelJunctions.mo
index 5d102252b58..fb104d98f0a 100644
--- a/Buildings/Experimental/DHC/Plants/Cooling/BaseClasses/ParallelJunctions.mo
+++ b/Buildings/DHC/Plants/Cooling/BaseClasses/ParallelJunctions.mo
@@ -1,4 +1,4 @@
-within Buildings.Experimental.DHC.Plants.Cooling.BaseClasses;
+within Buildings.DHC.Plants.Cooling.BaseClasses;
 model ParallelJunctions "A pair of junctions in parallel"
 
   replaceable package Medium =
diff --git a/Buildings/Experimental/DHC/Plants/Cooling/BaseClasses/ParallelPipes.mo b/Buildings/DHC/Plants/Cooling/BaseClasses/ParallelPipes.mo
similarity index 98%
rename from Buildings/Experimental/DHC/Plants/Cooling/BaseClasses/ParallelPipes.mo
rename to Buildings/DHC/Plants/Cooling/BaseClasses/ParallelPipes.mo
index 845a11e557a..48e4d360b2a 100644
--- a/Buildings/Experimental/DHC/Plants/Cooling/BaseClasses/ParallelPipes.mo
+++ b/Buildings/DHC/Plants/Cooling/BaseClasses/ParallelPipes.mo
@@ -1,4 +1,4 @@
-within Buildings.Experimental.DHC.Plants.Cooling.BaseClasses;
+within Buildings.DHC.Plants.Cooling.BaseClasses;
 model ParallelPipes "CHW supply and return pipes in parallel"
   extends Buildings.Fluid.Interfaces.PartialFourPortInterface(
     redeclare final package Medium1 = Medium,
diff --git a/Buildings/Experimental/DHC/Plants/Cooling/BaseClasses/ReversibleConnection.mo b/Buildings/DHC/Plants/Cooling/BaseClasses/ReversibleConnection.mo
similarity index 99%
rename from Buildings/Experimental/DHC/Plants/Cooling/BaseClasses/ReversibleConnection.mo
rename to Buildings/DHC/Plants/Cooling/BaseClasses/ReversibleConnection.mo
index 65fca950256..928f4724186 100644
--- a/Buildings/Experimental/DHC/Plants/Cooling/BaseClasses/ReversibleConnection.mo
+++ b/Buildings/DHC/Plants/Cooling/BaseClasses/ReversibleConnection.mo
@@ -1,4 +1,4 @@
-within Buildings.Experimental.DHC.Plants.Cooling.BaseClasses;
+within Buildings.DHC.Plants.Cooling.BaseClasses;
 model ReversibleConnection
   "A connection that supports reversible flow with a pump and a valve"
   extends Buildings.Fluid.Interfaces.PartialTwoPortInterface(
diff --git a/Buildings/Experimental/DHC/Plants/Cooling/BaseClasses/TankBranch.mo b/Buildings/DHC/Plants/Cooling/BaseClasses/TankBranch.mo
similarity index 99%
rename from Buildings/Experimental/DHC/Plants/Cooling/BaseClasses/TankBranch.mo
rename to Buildings/DHC/Plants/Cooling/BaseClasses/TankBranch.mo
index e40fa59f89e..1cbdd8b330d 100644
--- a/Buildings/Experimental/DHC/Plants/Cooling/BaseClasses/TankBranch.mo
+++ b/Buildings/DHC/Plants/Cooling/BaseClasses/TankBranch.mo
@@ -1,4 +1,4 @@
-within Buildings.Experimental.DHC.Plants.Cooling.BaseClasses;
+within Buildings.DHC.Plants.Cooling.BaseClasses;
 model TankBranch "Model of the tank branch of a storage plant"
 
   extends Buildings.Fluid.Interfaces.PartialFourPort(
diff --git a/Buildings/Experimental/DHC/Plants/Cooling/BaseClasses/Validation/IdealUser.mo b/Buildings/DHC/Plants/Cooling/BaseClasses/Validation/IdealUser.mo
similarity index 93%
rename from Buildings/Experimental/DHC/Plants/Cooling/BaseClasses/Validation/IdealUser.mo
rename to Buildings/DHC/Plants/Cooling/BaseClasses/Validation/IdealUser.mo
index 156d6b8207c..33b7fc25645 100644
--- a/Buildings/Experimental/DHC/Plants/Cooling/BaseClasses/Validation/IdealUser.mo
+++ b/Buildings/DHC/Plants/Cooling/BaseClasses/Validation/IdealUser.mo
@@ -1,4 +1,4 @@
-within Buildings.Experimental.DHC.Plants.Cooling.BaseClasses.Validation;
+within Buildings.DHC.Plants.Cooling.BaseClasses.Validation;
 model IdealUser "Test model for the dummy user"
   extends Modelica.Icons.Example;
 
@@ -21,7 +21,7 @@ model IdealUser "Test model for the dummy user"
   parameter Modelica.Units.SI.Power QCooLoa_flow_nominal=5*4200*0.9
     "Nominal cooling load of one consumer";
 
-  Buildings.Experimental.DHC.Plants.Cooling.BaseClasses.IdealUser ideUse(
+  Buildings.DHC.Plants.Cooling.BaseClasses.IdealUser ideUse(
     redeclare final package Medium = Medium,
     final m_flow_nominal=m_flow_nominal,
     T_CHWR_nominal=T_CHWR_nominal,
@@ -57,7 +57,7 @@ equation
                                              color={0,127,255}));
   connect(mPre_flow.y, ideUse.mPre_flow) annotation (Line(points={{-59,70},{-20,
           70},{-20,8},{-11,8}}, color={0,0,127}));
-annotation(__Dymola_Commands(file="modelica://Buildings/Resources/Scripts/Dymola/Experimental/DHC/Plants/Cooling/BaseClasses/Validation/IdealUser.mos"
+annotation(__Dymola_Commands(file="modelica://Buildings/Resources/Scripts/Dymola/DHC/Plants/Cooling/BaseClasses/Validation/IdealUser.mos"
         "Simulate and plot"),
 experiment(Tolerance=1e-06, StopTime=3600), Documentation(info="<html>
 <p>
diff --git a/Buildings/Experimental/DHC/Plants/Cooling/BaseClasses/Validation/package.mo b/Buildings/DHC/Plants/Cooling/BaseClasses/Validation/package.mo
similarity index 78%
rename from Buildings/Experimental/DHC/Plants/Cooling/BaseClasses/Validation/package.mo
rename to Buildings/DHC/Plants/Cooling/BaseClasses/Validation/package.mo
index 9da11f1ef99..40167c11c3e 100644
--- a/Buildings/Experimental/DHC/Plants/Cooling/BaseClasses/Validation/package.mo
+++ b/Buildings/DHC/Plants/Cooling/BaseClasses/Validation/package.mo
@@ -1,4 +1,4 @@
-within Buildings.Experimental.DHC.Plants.Cooling.BaseClasses;
+within Buildings.DHC.Plants.Cooling.BaseClasses;
 package Validation "Package containing validation models"
   extends Modelica.Icons.ExamplesPackage;
   annotation (Documentation(info="<html>
diff --git a/Buildings/Experimental/DHC/Plants/Cooling/BaseClasses/Validation/package.order b/Buildings/DHC/Plants/Cooling/BaseClasses/Validation/package.order
similarity index 100%
rename from Buildings/Experimental/DHC/Plants/Cooling/BaseClasses/Validation/package.order
rename to Buildings/DHC/Plants/Cooling/BaseClasses/Validation/package.order
diff --git a/Buildings/Experimental/DHC/Plants/Cooling/BaseClasses/package.mo b/Buildings/DHC/Plants/Cooling/BaseClasses/package.mo
similarity index 79%
rename from Buildings/Experimental/DHC/Plants/Cooling/BaseClasses/package.mo
rename to Buildings/DHC/Plants/Cooling/BaseClasses/package.mo
index 1b2cf6c94c0..e56a61de04c 100644
--- a/Buildings/Experimental/DHC/Plants/Cooling/BaseClasses/package.mo
+++ b/Buildings/DHC/Plants/Cooling/BaseClasses/package.mo
@@ -1,4 +1,4 @@
-within Buildings.Experimental.DHC.Plants.Cooling;
+within Buildings.DHC.Plants.Cooling;
 package BaseClasses "Package containing base classes"
   extends Modelica.Icons.BasesPackage;
   annotation (Documentation(info="<html>
diff --git a/Buildings/Experimental/DHC/Plants/Cooling/BaseClasses/package.order b/Buildings/DHC/Plants/Cooling/BaseClasses/package.order
similarity index 100%
rename from Buildings/Experimental/DHC/Plants/Cooling/BaseClasses/package.order
rename to Buildings/DHC/Plants/Cooling/BaseClasses/package.order
diff --git a/Buildings/Experimental/DHC/Plants/Cooling/Controls/ChilledWaterBypass.mo b/Buildings/DHC/Plants/Cooling/Controls/ChilledWaterBypass.mo
similarity index 98%
rename from Buildings/Experimental/DHC/Plants/Cooling/Controls/ChilledWaterBypass.mo
rename to Buildings/DHC/Plants/Cooling/Controls/ChilledWaterBypass.mo
index e7b68c237c4..1afa798227f 100644
--- a/Buildings/Experimental/DHC/Plants/Cooling/Controls/ChilledWaterBypass.mo
+++ b/Buildings/DHC/Plants/Cooling/Controls/ChilledWaterBypass.mo
@@ -1,4 +1,4 @@
-within Buildings.Experimental.DHC.Plants.Cooling.Controls;
+within Buildings.DHC.Plants.Cooling.Controls;
 model ChilledWaterBypass
   "Controller for chilled water bypass valve"
   extends Modelica.Blocks.Icons.Block;
diff --git a/Buildings/Experimental/DHC/Plants/Cooling/Controls/ChilledWaterPumpSpeed.mo b/Buildings/DHC/Plants/Cooling/Controls/ChilledWaterPumpSpeed.mo
similarity index 99%
rename from Buildings/Experimental/DHC/Plants/Cooling/Controls/ChilledWaterPumpSpeed.mo
rename to Buildings/DHC/Plants/Cooling/Controls/ChilledWaterPumpSpeed.mo
index cbe589922d9..6a83280cfc6 100644
--- a/Buildings/Experimental/DHC/Plants/Cooling/Controls/ChilledWaterPumpSpeed.mo
+++ b/Buildings/DHC/Plants/Cooling/Controls/ChilledWaterPumpSpeed.mo
@@ -1,4 +1,4 @@
-within Buildings.Experimental.DHC.Plants.Cooling.Controls;
+within Buildings.DHC.Plants.Cooling.Controls;
 model ChilledWaterPumpSpeed
   "Controller for two headered variable speed chilled water pumps"
   extends Modelica.Blocks.Icons.Block;
diff --git a/Buildings/Experimental/DHC/Plants/Cooling/Controls/ChillerStage.mo b/Buildings/DHC/Plants/Cooling/Controls/ChillerStage.mo
similarity index 98%
rename from Buildings/Experimental/DHC/Plants/Cooling/Controls/ChillerStage.mo
rename to Buildings/DHC/Plants/Cooling/Controls/ChillerStage.mo
index d4bfbbfa1a5..a4f0f3b4a15 100644
--- a/Buildings/Experimental/DHC/Plants/Cooling/Controls/ChillerStage.mo
+++ b/Buildings/DHC/Plants/Cooling/Controls/ChillerStage.mo
@@ -1,4 +1,4 @@
-within Buildings.Experimental.DHC.Plants.Cooling.Controls;
+within Buildings.DHC.Plants.Cooling.Controls;
 model ChillerStage
   "Chiller staging controller for plants with two chillers of the same size"
   replaceable package Medium=Buildings.Media.Water
@@ -236,6 +236,6 @@ operation. </li>
 <p>Note: This model can be used for plants with two chillers with or without
 waterside econimizer (WSE). For plants with WSE, extra control logic on top of
 this model needs to be added. </p>
-<p><img src=\"modelica://Buildings/Resources/Images/Experimental/DHC/Plants/Cooling/Controls/ChillerStage.png\" alt=\"State graph\"/>. </p>
+<p><img src=\"modelica://Buildings/Resources/Images/DHC/Plants/Cooling/Controls/ChillerStage.png\" alt=\"State graph\"/>. </p>
 </html>"));
 end ChillerStage;
diff --git a/Buildings/Experimental/DHC/Plants/Cooling/Controls/FlowControl.mo b/Buildings/DHC/Plants/Cooling/Controls/FlowControl.mo
similarity index 99%
rename from Buildings/Experimental/DHC/Plants/Cooling/Controls/FlowControl.mo
rename to Buildings/DHC/Plants/Cooling/Controls/FlowControl.mo
index ee8c17eec8a..11f249c3291 100644
--- a/Buildings/Experimental/DHC/Plants/Cooling/Controls/FlowControl.mo
+++ b/Buildings/DHC/Plants/Cooling/Controls/FlowControl.mo
@@ -1,4 +1,4 @@
-within Buildings.Experimental.DHC.Plants.Cooling.Controls;
+within Buildings.DHC.Plants.Cooling.Controls;
 block FlowControl
   "This block controls the flow at the primary and secondary pumps"
   extends Modelica.Blocks.Icons.Block;
diff --git a/Buildings/Experimental/DHC/Plants/Cooling/Controls/SelectMin.mo b/Buildings/DHC/Plants/Cooling/Controls/SelectMin.mo
similarity index 97%
rename from Buildings/Experimental/DHC/Plants/Cooling/Controls/SelectMin.mo
rename to Buildings/DHC/Plants/Cooling/Controls/SelectMin.mo
index 25f67a144d9..be6baea2652 100644
--- a/Buildings/Experimental/DHC/Plants/Cooling/Controls/SelectMin.mo
+++ b/Buildings/DHC/Plants/Cooling/Controls/SelectMin.mo
@@ -1,4 +1,4 @@
-within Buildings.Experimental.DHC.Plants.Cooling.Controls;
+within Buildings.DHC.Plants.Cooling.Controls;
 block SelectMin
   "Block that includes or excludes storage plant pressure signal for min"
   extends Modelica.Blocks.Icons.Block;
diff --git a/Buildings/Experimental/DHC/Plants/Cooling/Controls/TankStatus.mo b/Buildings/DHC/Plants/Cooling/Controls/TankStatus.mo
similarity index 98%
rename from Buildings/Experimental/DHC/Plants/Cooling/Controls/TankStatus.mo
rename to Buildings/DHC/Plants/Cooling/Controls/TankStatus.mo
index 88337ec556a..717490cee1b 100644
--- a/Buildings/Experimental/DHC/Plants/Cooling/Controls/TankStatus.mo
+++ b/Buildings/DHC/Plants/Cooling/Controls/TankStatus.mo
@@ -1,4 +1,4 @@
-within Buildings.Experimental.DHC.Plants.Cooling.Controls;
+within Buildings.DHC.Plants.Cooling.Controls;
 block TankStatus "Returns the tank status from its temperature sensors"
 
   parameter Modelica.Units.SI.Temperature THig
diff --git a/Buildings/Experimental/DHC/Plants/Cooling/Controls/Validation/ChilledWaterBypass.mo b/Buildings/DHC/Plants/Cooling/Controls/Validation/ChilledWaterBypass.mo
similarity index 79%
rename from Buildings/Experimental/DHC/Plants/Cooling/Controls/Validation/ChilledWaterBypass.mo
rename to Buildings/DHC/Plants/Cooling/Controls/Validation/ChilledWaterBypass.mo
index a9d1187de33..2250c0411a5 100644
--- a/Buildings/Experimental/DHC/Plants/Cooling/Controls/Validation/ChilledWaterBypass.mo
+++ b/Buildings/DHC/Plants/Cooling/Controls/Validation/ChilledWaterBypass.mo
@@ -1,8 +1,8 @@
-within Buildings.Experimental.DHC.Plants.Cooling.Controls.Validation;
+within Buildings.DHC.Plants.Cooling.Controls.Validation;
 model ChilledWaterBypass
   "Example to test the chilled water bypass controller"
   extends Modelica.Icons.Example;
-  Buildings.Experimental.DHC.Plants.Cooling.Controls.ChilledWaterBypass chiBypCon(numChi=2,
+  Buildings.DHC.Plants.Cooling.Controls.ChilledWaterBypass chiBypCon(numChi=2,
     mMin_flow=0.03)
     "Chilled water bypass loop control"
     annotation (Placement(transformation(extent={{0,-20},{20,0}})));
@@ -42,7 +42,7 @@ equation
     experiment(
       Tolerance=1e-06, StopTime=1200),
     __Dymola_Commands(
-      file="modelica://Buildings/Resources/Scripts/Dymola/Experimental/DHC/Plants/Cooling/Controls/Validation/ChilledWaterBypass.mos"
+      file="modelica://Buildings/Resources/Scripts/Dymola/DHC/Plants/Cooling/Controls/Validation/ChilledWaterBypass.mos"
       "Simulate and Plot"),
     Documentation(
       revisions="<html>
@@ -55,8 +55,8 @@ First implementation.
 </html>",
       info="<html>
 <p>This model validates the chilled water bypass valve control logic implemented in
-<a href=\"modelica://Buildings.Experimental.DHC.Plants.Cooling.Controls.ChilledWaterBypass\">
-Buildings.Experimental.DHC.Plants.Cooling.Controls.ChilledWaterBypass</a>.
+<a href=\"modelica://Buildings.DHC.Plants.Cooling.Controls.ChilledWaterBypass\">
+Buildings.DHC.Plants.Cooling.Controls.ChilledWaterBypass</a>.
 </p>
 </html>"));
 end ChilledWaterBypass;
diff --git a/Buildings/Experimental/DHC/Plants/Cooling/Controls/Validation/ChilledWaterPumpSpeed.mo b/Buildings/DHC/Plants/Cooling/Controls/Validation/ChilledWaterPumpSpeed.mo
similarity index 81%
rename from Buildings/Experimental/DHC/Plants/Cooling/Controls/Validation/ChilledWaterPumpSpeed.mo
rename to Buildings/DHC/Plants/Cooling/Controls/Validation/ChilledWaterPumpSpeed.mo
index 0b2b5ec3821..cfb99ee27ac 100644
--- a/Buildings/Experimental/DHC/Plants/Cooling/Controls/Validation/ChilledWaterPumpSpeed.mo
+++ b/Buildings/DHC/Plants/Cooling/Controls/Validation/ChilledWaterPumpSpeed.mo
@@ -1,8 +1,8 @@
-within Buildings.Experimental.DHC.Plants.Cooling.Controls.Validation;
+within Buildings.DHC.Plants.Cooling.Controls.Validation;
 model ChilledWaterPumpSpeed
   "Example to test the chilled water pump speed controller"
   extends Modelica.Icons.Example;
-  Buildings.Experimental.DHC.Plants.Cooling.Controls.ChilledWaterPumpSpeed chiWatPumSpe(
+  Buildings.DHC.Plants.Cooling.Controls.ChilledWaterPumpSpeed chiWatPumSpe(
     dpSetPoi=68900,
     tWai=30,
     m_flow_nominal=0.5,
@@ -44,7 +44,7 @@ equation
       StopTime=1200,
       Tolerance=1e-06),
     __Dymola_Commands(
-      file="modelica://Buildings/Resources/Scripts/Dymola/Experimental/DHC/Plants/Cooling/Controls/Validation/ChilledWaterPumpSpeed.mos"
+      file="modelica://Buildings/Resources/Scripts/Dymola/DHC/Plants/Cooling/Controls/Validation/ChilledWaterPumpSpeed.mos"
       "Simulate and Plot"),
     Documentation(
       revisions="<html>
@@ -61,8 +61,8 @@ First implementation.
 </html>",
       info="<html>
 <p>This model validates the variable speed pump control logic implemented in
-<a href=\"modelica://Buildings.Experimental.DHC.Plants.Cooling.Controls.ChilledWaterPumpSpeed\">
-Buildings.Experimental.DHC.Plants.Cooling.Controls.ChilledWaterPumpSpeed</a>.
+<a href=\"modelica://Buildings.DHC.Plants.Cooling.Controls.ChilledWaterPumpSpeed\">
+Buildings.DHC.Plants.Cooling.Controls.ChilledWaterPumpSpeed</a>.
 </p>
 </html>"));
 end ChilledWaterPumpSpeed;
diff --git a/Buildings/Experimental/DHC/Plants/Cooling/Controls/Validation/ChillerStage.mo b/Buildings/DHC/Plants/Cooling/Controls/Validation/ChillerStage.mo
similarity index 82%
rename from Buildings/Experimental/DHC/Plants/Cooling/Controls/Validation/ChillerStage.mo
rename to Buildings/DHC/Plants/Cooling/Controls/Validation/ChillerStage.mo
index 21b7a769bd3..7da52405806 100644
--- a/Buildings/Experimental/DHC/Plants/Cooling/Controls/Validation/ChillerStage.mo
+++ b/Buildings/DHC/Plants/Cooling/Controls/Validation/ChillerStage.mo
@@ -1,8 +1,8 @@
-within Buildings.Experimental.DHC.Plants.Cooling.Controls.Validation;
+within Buildings.DHC.Plants.Cooling.Controls.Validation;
 model ChillerStage
   "Example to test the chiller staging controller"
   extends Modelica.Icons.Example;
-  Buildings.Experimental.DHC.Plants.Cooling.Controls.ChillerStage chiStaCon(
+  Buildings.DHC.Plants.Cooling.Controls.ChillerStage chiStaCon(
     tWai=30,
     QChi_nominal=-200*3.517*1000)
     "Chiller staging controller"
@@ -47,7 +47,7 @@ equation
       StopTime=1200,
       Tolerance=1e-06),
     __Dymola_Commands(
-      file="modelica://Buildings/Resources/Scripts/Dymola/Experimental/DHC/Plants/Cooling/Controls/Validation/ChillerStage.mos"
+      file="modelica://Buildings/Resources/Scripts/Dymola/DHC/Plants/Cooling/Controls/Validation/ChillerStage.mos"
       "Simulate and Plot"),
     Documentation(
       revisions="<html>
@@ -60,8 +60,8 @@ First implementation.
 </html>",
       info="<html>
 <p>This model validates the chiller staging control logic implemented in
-<a href=\"modelica://Buildings.Experimental.DHC.Plants.Cooling.Controls.ChillerStage\">
-Buildings.Experimental.DHC.Plants.Cooling.Controls.ChillerStage</a>.
+<a href=\"modelica://Buildings.DHC.Plants.Cooling.Controls.ChillerStage\">
+Buildings.DHC.Plants.Cooling.Controls.ChillerStage</a>.
 </p>
 </html>"));
 end ChillerStage;
diff --git a/Buildings/Experimental/DHC/Plants/Cooling/Controls/Validation/TankStatus.mo b/Buildings/DHC/Plants/Cooling/Controls/Validation/TankStatus.mo
similarity index 80%
rename from Buildings/Experimental/DHC/Plants/Cooling/Controls/Validation/TankStatus.mo
rename to Buildings/DHC/Plants/Cooling/Controls/Validation/TankStatus.mo
index bc8ebd082fc..4918ab83bb7 100644
--- a/Buildings/Experimental/DHC/Plants/Cooling/Controls/Validation/TankStatus.mo
+++ b/Buildings/DHC/Plants/Cooling/Controls/Validation/TankStatus.mo
@@ -1,7 +1,7 @@
-within Buildings.Experimental.DHC.Plants.Cooling.Controls.Validation;
+within Buildings.DHC.Plants.Cooling.Controls.Validation;
 model TankStatus "Validation model for tank status controller"
   extends Modelica.Icons.Example;
-  Buildings.Experimental.DHC.Plants.Cooling.Controls.TankStatus tanSta(
+  Buildings.DHC.Plants.Cooling.Controls.TankStatus tanSta(
     TLow=280.15,
     THig=286.15,
     dTHys=1) "Tank status"
@@ -22,7 +22,7 @@ equation
           {-6,10.25},{-1,10.25}}, color={0,0,127}));
           annotation(experiment(Tolerance=1e-6, StopTime=1),
           __Dymola_Commands(
-      file="modelica://Buildings/Resources/Scripts/Dymola/Experimental/DHC/Plants/Cooling/Controls/Validation/TankStatus.mos"
+      file="modelica://Buildings/Resources/Scripts/Dymola/DHC/Plants/Cooling/Controls/Validation/TankStatus.mos"
       "Simulate and Plot"),
     Documentation(
       revisions="<html>
@@ -37,8 +37,8 @@ First implementation. This is for
       info="<html>
 <p>
 This model validates
-<a href=\"modelica://Buildings.Experimental.DHC.Plants.Cooling.Controls.TankStatus\">
-Buildings.Experimental.DHC.Plants.Cooling.Controls.TankStatus</a>.
+<a href=\"modelica://Buildings.DHC.Plants.Cooling.Controls.TankStatus\">
+Buildings.DHC.Plants.Cooling.Controls.TankStatus</a>.
 Note that the output signals turn <code>true</code> as soon as their respective temperature
 input crosses the threshold, but there is a delay for it to turn back to
 <code>false</code> due to the hysteresis.
diff --git a/Buildings/DHC/Plants/Cooling/Controls/Validation/package.mo b/Buildings/DHC/Plants/Cooling/Controls/Validation/package.mo
new file mode 100644
index 00000000000..dad8f5b91a7
--- /dev/null
+++ b/Buildings/DHC/Plants/Cooling/Controls/Validation/package.mo
@@ -0,0 +1,14 @@
+within Buildings.DHC.Plants.Cooling.Controls;
+package Validation "Collection of validation models"
+  extends Modelica.Icons.ExamplesPackage;
+
+  annotation (
+    Documentation(
+      info="<html>
+<p>
+This package contains validation models for the classes in
+<a href=\"modelica://Buildings.DHC.Plants.Cooling.Controls\">
+Buildings.DHC.Plants.Cooling.Controls</a>.
+</p>
+</html>"));
+end Validation;
diff --git a/Buildings/Experimental/DHC/Plants/Cooling/Controls/Validation/package.order b/Buildings/DHC/Plants/Cooling/Controls/Validation/package.order
similarity index 100%
rename from Buildings/Experimental/DHC/Plants/Cooling/Controls/Validation/package.order
rename to Buildings/DHC/Plants/Cooling/Controls/Validation/package.order
diff --git a/Buildings/Experimental/DHC/Plants/Cooling/Controls/package.mo b/Buildings/DHC/Plants/Cooling/Controls/package.mo
similarity index 85%
rename from Buildings/Experimental/DHC/Plants/Cooling/Controls/package.mo
rename to Buildings/DHC/Plants/Cooling/Controls/package.mo
index d648d90b573..1eeff36e292 100644
--- a/Buildings/Experimental/DHC/Plants/Cooling/Controls/package.mo
+++ b/Buildings/DHC/Plants/Cooling/Controls/package.mo
@@ -1,4 +1,4 @@
-within Buildings.Experimental.DHC.Plants.Cooling;
+within Buildings.DHC.Plants.Cooling;
 package Controls "Package of control sequences for cooling plants"
   extends Modelica.Icons.VariantsPackage;
 
diff --git a/Buildings/Experimental/DHC/Plants/Cooling/Controls/package.order b/Buildings/DHC/Plants/Cooling/Controls/package.order
similarity index 100%
rename from Buildings/Experimental/DHC/Plants/Cooling/Controls/package.order
rename to Buildings/DHC/Plants/Cooling/Controls/package.order
diff --git a/Buildings/Experimental/DHC/Plants/Cooling/ElectricChillerParallel.mo b/Buildings/DHC/Plants/Cooling/ElectricChillerParallel.mo
similarity index 95%
rename from Buildings/Experimental/DHC/Plants/Cooling/ElectricChillerParallel.mo
rename to Buildings/DHC/Plants/Cooling/ElectricChillerParallel.mo
index 429b4f2e989..a10dc21cd12 100644
--- a/Buildings/Experimental/DHC/Plants/Cooling/ElectricChillerParallel.mo
+++ b/Buildings/DHC/Plants/Cooling/ElectricChillerParallel.mo
@@ -1,12 +1,12 @@
-within Buildings.Experimental.DHC.Plants.Cooling;
+within Buildings.DHC.Plants.Cooling;
 model ElectricChillerParallel
   "District cooling plant model"
-  extends Buildings.Experimental.DHC.Plants.BaseClasses.PartialPlant(
+  extends Buildings.DHC.Plants.BaseClasses.PartialPlant(
     have_eleCoo=true,
     have_pum=true,
     have_fan=true,
     have_weaBus=true,
-    typ=Buildings.Experimental.DHC.Types.DistrictSystemType.Cooling);
+    typ=Buildings.DHC.Types.DistrictSystemType.Cooling);
   // chiller parameters
   final parameter Integer numChi=2
     "Number of chillers"
@@ -123,7 +123,7 @@ model ElectricChillerParallel
     redeclare final package Medium2=Medium)
     "Chillers connected in parallel"
     annotation (Placement(transformation(extent={{60,40},{40,60}})));
-  Buildings.Experimental.DHC.Plants.Cooling.Subsystems.CoolingTowersWithBypass cooTowWitByp(
+  Buildings.DHC.Plants.Cooling.Subsystems.CoolingTowersWithBypass cooTowWitByp(
     redeclare final package Medium=Medium,
     final num=numChi,
     final m_flow_nominal=mCW_flow_nominal,
@@ -188,7 +188,7 @@ model ElectricChillerParallel
     final m_flow_nominal=mCHW_flow_nominal)
     "Chilled water supply temperature"
     annotation (Placement(transformation(extent={{140,-30},{160,-50}})));
-  Buildings.Experimental.DHC.Plants.Cooling.Controls.ChillerStage chiStaCon(
+  Buildings.DHC.Plants.Cooling.Controls.ChillerStage chiStaCon(
     final tWai=tWai,
     final QChi_nominal=QChi_nominal)
     "Chiller staging controller"
@@ -247,7 +247,7 @@ model ElectricChillerParallel
     "Flow splitter for the chilled water supply side"
     annotation (Placement(transformation(extent={{10,-10},{-10,10}},
       rotation=90,origin={120,-42})));
-  Buildings.Experimental.DHC.Plants.Cooling.Controls.ChilledWaterBypass chiBypCon(
+  Buildings.DHC.Plants.Cooling.Controls.ChilledWaterBypass chiBypCon(
     final numChi=numChi,
     final mMin_flow=mMin_flow,
     k=1,
@@ -386,8 +386,8 @@ Buildings.Applications.BaseClasses.Equipment.ElectricChillerParallel</a>. </li>
 <li>The chilled water bypass loop is controlled to ensure a minimum flow of
 chilled water running through the chillers all the time. </li>
 <li>The condenser water is cooled by two parallel cooling towers with a bypass
-loop. See <a href=\"modelica://Buildings.Experimental.DHC.Plants.Cooling.Subsystems.CoolingTowersWithBypass\">
-Buildings.Experimental.DHC.Plants.Cooling.Subsystems.CoolingTowersWithBypass</a>
+loop. See <a href=\"modelica://Buildings.DHC.Plants.Cooling.Subsystems.CoolingTowersWithBypass\">
+Buildings.DHC.Plants.Cooling.Subsystems.CoolingTowersWithBypass</a>
 for the details of the modeling of the cooling towers. </li>
 <li>The chilled water loop is equipped with two parallel constant speed pumps,
 which run one-and-one with each chiller. The condenser water pumps are constant speed with prescribed
@@ -396,10 +396,10 @@ mass flow rates. </li>
 external control. </li>
 </ul>
 <p>The staging of the chillers is based on the calculated cooling load. </p>
-<p>See <a href=\"modelica://Buildings.Experimental.DHC.Plants.Cooling.Controls.ChillerStage\">
-Buildings.Experimental.DHC.Plants.Cooling.Controls.ChillerStage</a> for
+<p>See <a href=\"modelica://Buildings.DHC.Plants.Cooling.Controls.ChillerStage\">
+Buildings.DHC.Plants.Cooling.Controls.ChillerStage</a> for
 the detailed control logic. </p>
-<p align=\"center\"><img src=\"modelica://Buildings/Resources/Images/Experimental/DHC/Plants/Cooling/ElectricChillerParallel.png\" alt=\"System schematics\"/>. </p>
+<p align=\"center\"><img src=\"modelica://Buildings/Resources/Images/DHC/Plants/Cooling/ElectricChillerParallel.png\" alt=\"System schematics\"/>. </p>
 </html>",
       revisions="<html>
 <ul>
diff --git a/Buildings/Experimental/DHC/Plants/Cooling/Examples/ElectricChillerParallel.mo b/Buildings/DHC/Plants/Cooling/Examples/ElectricChillerParallel.mo
similarity index 94%
rename from Buildings/Experimental/DHC/Plants/Cooling/Examples/ElectricChillerParallel.mo
rename to Buildings/DHC/Plants/Cooling/Examples/ElectricChillerParallel.mo
index 4d31cc294a5..4157a83e90d 100644
--- a/Buildings/Experimental/DHC/Plants/Cooling/Examples/ElectricChillerParallel.mo
+++ b/Buildings/DHC/Plants/Cooling/Examples/ElectricChillerParallel.mo
@@ -1,4 +1,4 @@
-within Buildings.Experimental.DHC.Plants.Cooling.Examples;
+within Buildings.DHC.Plants.Cooling.Examples;
 model ElectricChillerParallel
   "Example to test the chiller cooling plant"
   extends Modelica.Icons.Example;
@@ -43,7 +43,7 @@ model ElectricChillerParallel
     "Nominal pressure drop of chilled water pump valve";
   parameter Modelica.Units.SI.PressureDifference dpCooTowVal_nominal=6000
     "Nominal pressure difference of the cooling tower valve";
-  replaceable Buildings.Experimental.DHC.Plants.Cooling.ElectricChillerParallel pla(
+  replaceable Buildings.DHC.Plants.Cooling.ElectricChillerParallel pla(
     perChi=perChi,
     dTApp=dTApp,
     perCHWPum=perCHWPum,
@@ -136,8 +136,8 @@ equation
     Documentation(
       info="<html>
 <p>This model validates the district central cooling plant implemented in
-<a href=\"modelica://Buildings.Experimental.DHC.Plants.Cooling.ElectricChillerParallel\">
-Buildings.Experimental.DHC.Plants.Cooling.ElectricChillerParallel</a>.
+<a href=\"modelica://Buildings.DHC.Plants.Cooling.ElectricChillerParallel\">
+Buildings.DHC.Plants.Cooling.ElectricChillerParallel</a>.
 </p>
 </html>",
       revisions="<html>
@@ -158,6 +158,6 @@ First implementation.
 </ul>
 </html>"),
     __Dymola_Commands(
-      file="modelica://Buildings/Resources/Scripts/Dymola/Experimental/DHC/Plants/Cooling/Examples/ElectricChillerParallel.mos"
+      file="modelica://Buildings/Resources/Scripts/Dymola/DHC/Plants/Cooling/Examples/ElectricChillerParallel.mos"
       "Simulate and Plot"));
 end ElectricChillerParallel;
diff --git a/Buildings/Experimental/DHC/Plants/Cooling/Examples/StoragePlantDualSource.mo b/Buildings/DHC/Plants/Cooling/Examples/StoragePlantDualSource.mo
similarity index 94%
rename from Buildings/Experimental/DHC/Plants/Cooling/Examples/StoragePlantDualSource.mo
rename to Buildings/DHC/Plants/Cooling/Examples/StoragePlantDualSource.mo
index eb7225d174d..39ad7ee7ccb 100644
--- a/Buildings/Experimental/DHC/Plants/Cooling/Examples/StoragePlantDualSource.mo
+++ b/Buildings/DHC/Plants/Cooling/Examples/StoragePlantDualSource.mo
@@ -1,4 +1,4 @@
-within Buildings.Experimental.DHC.Plants.Cooling.Examples;
+within Buildings.DHC.Plants.Cooling.Examples;
 model StoragePlantDualSource
   "Idealised district system model with two sources and three users"
   extends Modelica.Icons.Example;
@@ -51,12 +51,12 @@ model StoragePlantDualSource
         extent={{10,10},{-10,-10}},
         rotation=180,
         origin={-130,150})));
-  Buildings.Experimental.DHC.Plants.Cooling.Controls.SelectMin selMin_dp(nin=3)
+  Buildings.DHC.Plants.Cooling.Controls.SelectMin selMin_dp(nin=3)
     "Min of pressure heads with the signal from storage plant optionally used"
     annotation (Placement(transformation(extent={{-180,100},{-160,120}})));
 
 // Second plant: chiller and tank
-  Buildings.Experimental.DHC.Plants.Cooling.StoragePlant stoPla(redeclare
+  Buildings.DHC.Plants.Cooling.StoragePlant stoPla(redeclare
       final package Medium = Medium,
     mTan_flow_nominal=mTan_flow_nominal,
     mChi_flow_nominal=mChi_flow_nominal,
@@ -89,7 +89,7 @@ model StoragePlantDualSource
         origin={-222,110})));
 
 // Users
-  Buildings.Experimental.DHC.Plants.Cooling.BaseClasses.IdealUser ideUse1(
+  Buildings.DHC.Plants.Cooling.BaseClasses.IdealUser ideUse1(
     redeclare final package Medium = Medium,
     final m_flow_nominal=0.6*m_flow_nominal,
     dp_nominal=0.2*dp_nominal,
@@ -98,7 +98,7 @@ model StoragePlantDualSource
         extent={{-10,-10},{10,10}},
         rotation=0,
         origin={130,150})));
-  Buildings.Experimental.DHC.Plants.Cooling.BaseClasses.IdealUser ideUse2(
+  Buildings.DHC.Plants.Cooling.BaseClasses.IdealUser ideUse2(
     redeclare final package Medium = Medium,
     final m_flow_nominal=0.65*m_flow_nominal,
     dp_nominal=0.2*dp_nominal,
@@ -107,7 +107,7 @@ model StoragePlantDualSource
         extent={{-10,-10},{10,10}},
         rotation=0,
         origin={130,-10})));
-  Buildings.Experimental.DHC.Plants.Cooling.BaseClasses.IdealUser ideUse3(
+  Buildings.DHC.Plants.Cooling.BaseClasses.IdealUser ideUse3(
     redeclare final package Medium = Medium,
     final m_flow_nominal=0.65*m_flow_nominal,
     dp_nominal=0.2*dp_nominal,
@@ -150,7 +150,7 @@ model StoragePlantDualSource
         origin={202,-166})));
 
 // District pipe network
-  Buildings.Experimental.DHC.Plants.Cooling.BaseClasses.ParallelJunctions
+  Buildings.DHC.Plants.Cooling.BaseClasses.ParallelJunctions
     parJunPla1(
     redeclare final package Medium = Medium,
     T1_start=T_CHWS_nominal,
@@ -161,7 +161,7 @@ model StoragePlantDualSource
         extent={{-10,10},{10,-10}},
         rotation=-90,
         origin={10,70})));
-  Buildings.Experimental.DHC.Plants.Cooling.BaseClasses.ParallelJunctions
+  Buildings.DHC.Plants.Cooling.BaseClasses.ParallelJunctions
     parJunUse2(
     redeclare final package Medium = Medium,
     T1_start=T_CHWR_nominal,
@@ -172,7 +172,7 @@ model StoragePlantDualSource
         extent={{-10,10},{10,-10}},
         rotation=90,
         origin={10,-10})));
-  Buildings.Experimental.DHC.Plants.Cooling.BaseClasses.ParallelJunctions
+  Buildings.DHC.Plants.Cooling.BaseClasses.ParallelJunctions
     parJunPla2(
     redeclare final package Medium = Medium,
     T1_start=T_CHWS_nominal,
@@ -183,7 +183,7 @@ model StoragePlantDualSource
         extent={{-10,10},{10,-10}},
         rotation=-90,
         origin={10,-90})));
-  Buildings.Experimental.DHC.Plants.Cooling.BaseClasses.ParallelPipes
+  Buildings.DHC.Plants.Cooling.BaseClasses.ParallelPipes
     parPipS1U1(
     redeclare package Medium = Medium,
     m_flow_nominal=m_flow_nominal,
@@ -192,7 +192,7 @@ model StoragePlantDualSource
         extent={{10,-10},{-10,10}},
         rotation=-90,
         origin={10,110})));
-  Buildings.Experimental.DHC.Plants.Cooling.BaseClasses.ParallelPipes
+  Buildings.DHC.Plants.Cooling.BaseClasses.ParallelPipes
     parPipS1U2(
     redeclare package Medium = Medium,
     m_flow_nominal=2*m_flow_nominal,
@@ -201,7 +201,7 @@ model StoragePlantDualSource
         extent={{10,-10},{-10,10}},
         rotation=-90,
         origin={10,30})));
-  Buildings.Experimental.DHC.Plants.Cooling.BaseClasses.ParallelPipes
+  Buildings.DHC.Plants.Cooling.BaseClasses.ParallelPipes
     parPipS2U2(
     redeclare package Medium = Medium,
     m_flow_nominal=2*m_flow_nominal,
@@ -210,7 +210,7 @@ model StoragePlantDualSource
         extent={{10,-10},{-10,10}},
         rotation=-90,
         origin={10,-50})));
-  Buildings.Experimental.DHC.Plants.Cooling.BaseClasses.ParallelPipes
+  Buildings.DHC.Plants.Cooling.BaseClasses.ParallelPipes
     parPipS2U3(
     redeclare package Medium = Medium,
     m_flow_nominal=m_flow_nominal,
@@ -363,7 +363,7 @@ equation
   connect(mulMax_yVal_actual.y, hys_yVal_actual.u)
     annotation (Line(points={{222,-210},{238,-210}}, color={0,0,127}));
   annotation (experiment(Tolerance=1e-06, StopTime=9000),
-    __Dymola_Commands(file="modelica://Buildings/Resources/Scripts/Dymola/Experimental/DHC/Plants/Cooling/Examples/StoragePlantDualSource.mos"
+    __Dymola_Commands(file="modelica://Buildings/Resources/Scripts/Dymola/DHC/Plants/Cooling/Examples/StoragePlantDualSource.mos"
         "Simulate and plot"),
         Icon(coordinateSystem(preserveAspectRatio=false, extent={{-100,-100},{100,
             100}})),                                             Diagram(
@@ -371,8 +371,8 @@ equation
         Documentation(info="<html>
 <p>
 The modelled system is described in the documentation of
-<a href=\"Modelica://Buildings.Experimental.DHC.Plants.Cooling.StoragePlant\">
-Buildings.Experimental.DHC.Plants.Cooling.StoragePlant</a>.
+<a href=\"Modelica://Buildings.DHC.Plants.Cooling.StoragePlant\">
+Buildings.DHC.Plants.Cooling.StoragePlant</a>.
 </p>
 <p>
 The source blocks give the system the following operation schedule during
diff --git a/Buildings/Experimental/DHC/EnergyTransferStations/Combined/Examples/package.mo b/Buildings/DHC/Plants/Cooling/Examples/package.mo
similarity index 58%
rename from Buildings/Experimental/DHC/EnergyTransferStations/Combined/Examples/package.mo
rename to Buildings/DHC/Plants/Cooling/Examples/package.mo
index ee0b1618d53..f5ec7336774 100644
--- a/Buildings/Experimental/DHC/EnergyTransferStations/Combined/Examples/package.mo
+++ b/Buildings/DHC/Plants/Cooling/Examples/package.mo
@@ -1,4 +1,4 @@
-within Buildings.Experimental.DHC.EnergyTransferStations.Combined;
+within Buildings.DHC.Plants.Cooling;
 package Examples "Example models integrating multiple components"
   extends Modelica.Icons.ExamplesPackage;
 
@@ -8,8 +8,8 @@ package Examples "Example models integrating multiple components"
       info="<html>
 <p>
 This package contains advanced examples illustrating the use of the models in
-<a href=\"modelica://Buildings.Experimental.DHC.EnergyTransferStations.Combined\">
-Buildings.Experimental.DHC.EnergyTransferStations.Combined</a>.
+<a href=\"modelica://Buildings.DHC.Plants.Cooling\">
+Buildings.DHC.Plants.Cooling</a>.
 </p>
 </html>"));
 end Examples;
diff --git a/Buildings/Experimental/DHC/Plants/Cooling/Examples/package.order b/Buildings/DHC/Plants/Cooling/Examples/package.order
similarity index 100%
rename from Buildings/Experimental/DHC/Plants/Cooling/Examples/package.order
rename to Buildings/DHC/Plants/Cooling/Examples/package.order
diff --git a/Buildings/Experimental/DHC/Plants/Cooling/StoragePlant.mo b/Buildings/DHC/Plants/Cooling/StoragePlant.mo
similarity index 94%
rename from Buildings/Experimental/DHC/Plants/Cooling/StoragePlant.mo
rename to Buildings/DHC/Plants/Cooling/StoragePlant.mo
index ea0c897470b..cfd92be68ba 100644
--- a/Buildings/Experimental/DHC/Plants/Cooling/StoragePlant.mo
+++ b/Buildings/DHC/Plants/Cooling/StoragePlant.mo
@@ -1,4 +1,4 @@
-within Buildings.Experimental.DHC.Plants.Cooling;
+within Buildings.DHC.Plants.Cooling;
 model StoragePlant "Model of a storage plant with a chiller and a CHW tank"
 
   extends Buildings.Fluid.Interfaces.PartialFourPort(
@@ -49,7 +49,7 @@ model StoragePlant "Model of a storage plant with a chiller and a CHW tank"
         extent={{10,-10},{-10,10}},
         rotation=0,
         origin={-30,-60})));
-  Buildings.Experimental.DHC.Plants.Cooling.BaseClasses.TankBranch tanBra(
+  Buildings.DHC.Plants.Cooling.BaseClasses.TankBranch tanBra(
     redeclare final package Medium = Medium,
     final m_flow_nominal=m_flow_nominal,
     final mTan_flow_nominal=mTan_flow_nominal,
@@ -63,7 +63,7 @@ model StoragePlant "Model of a storage plant with a chiller and a CHW tank"
         extent={{-10,-10},{10,10}},
         rotation=0,
         origin={10,-10})));
-  Buildings.Experimental.DHC.Plants.Cooling.BaseClasses.ReversibleConnection
+  Buildings.DHC.Plants.Cooling.BaseClasses.ReversibleConnection
     revCon(redeclare final package Medium = Medium,
     final m_flow_nominal=m_flow_nominal,
     final mTan_flow_nominal=mTan_flow_nominal,
@@ -72,12 +72,12 @@ model StoragePlant "Model of a storage plant with a chiller and a CHW tank"
     final T_start=T_CHWS_nominal)
     "Reversible connection"
     annotation (Placement(transformation(extent={{40,20},{60,40}})));
-  Buildings.Experimental.DHC.Plants.Cooling.Controls.FlowControl floCon(
+  Buildings.DHC.Plants.Cooling.Controls.FlowControl floCon(
     final mChi_flow_nominal=mChi_flow_nominal,
     final mTan_flow_nominal=mTan_flow_nominal)
     "Control block for storage plant flows"
     annotation (Placement(transformation(extent={{-60,40},{-40,60}})));
-  Buildings.Experimental.DHC.Plants.Cooling.Controls.TankStatus tanSta(
+  Buildings.DHC.Plants.Cooling.Controls.TankStatus tanSta(
     TLow=T_CHWS_nominal + 0.5,
     THig=T_CHWR_nominal - 0.5) "Tank status"
     annotation (Placement(transformation(extent={{40,-80},{60,-60}})));
@@ -252,8 +252,8 @@ chiller on the same CHW district network.
 <h4>System Concept Example</h4>
 <p>
 An example usage of this model within a district network is implemented in
-<a href=\"Modelica://Buildings.Experimental.DHC.Plants.Cooling.Examples.StoragePlantDualSource\">
-Buildings.Experimental.DHC.Plants.Cooling.Examples.StoragePlantDualSource</a>.
+<a href=\"Modelica://Buildings.DHC.Plants.Cooling.Examples.StoragePlantDualSource\">
+Buildings.DHC.Plants.Cooling.Examples.StoragePlantDualSource</a>.
 Shown in the schematic below, it has two CHW plants and three users.
 </p>
 <ul>
@@ -272,7 +272,7 @@ or throttle water from the pressurised network to charge the tank.
 </ul>
 <p align=\"center\">
 <img alt=\"SystemConcept\"
-src=\"modelica://Buildings/Resources/Images/Experimental/DHC/Plants/Cooling/SystemConcept.png\"/>
+src=\"modelica://Buildings/Resources/Images/DHC/Plants/Cooling/SystemConcept.png\"/>
 </p>
 <h4>Control Signals</h4>
 <p>
@@ -327,13 +327,13 @@ the district network.
 </ul>
 <p align=\"center\">
 <img alt=\"ControlSignals\"
-src=\"modelica://Buildings/Resources/Images/Experimental/DHC/Plants/Cooling/ControlSignals.png\"/>
+src=\"modelica://Buildings/Resources/Images/DHC/Plants/Cooling/ControlSignals.png\"/>
 </p>
 <h4>Implementation</h4>
 <p>
 The flow control of the storage plant is implemented as a state graph in
-<a href=\"modelica://Buildings.Experimental.DHC.Plants.Cooling.Controls.FlowControl\">
-Buildings.Experimental.DHC.Plants.Cooling.Controls.FlowControl</a>.
+<a href=\"modelica://Buildings.DHC.Plants.Cooling.Controls.FlowControl\">
+Buildings.DHC.Plants.Cooling.Controls.FlowControl</a>.
 </p>
 </html>", revisions="<html>
 <ul>
diff --git a/Buildings/Experimental/DHC/Plants/Cooling/Subsystems/CoolingTowersParallel.mo b/Buildings/DHC/Plants/Cooling/Subsystems/CoolingTowersParallel.mo
similarity index 99%
rename from Buildings/Experimental/DHC/Plants/Cooling/Subsystems/CoolingTowersParallel.mo
rename to Buildings/DHC/Plants/Cooling/Subsystems/CoolingTowersParallel.mo
index cb83c42db4a..22306a0c14e 100644
--- a/Buildings/Experimental/DHC/Plants/Cooling/Subsystems/CoolingTowersParallel.mo
+++ b/Buildings/DHC/Plants/Cooling/Subsystems/CoolingTowersParallel.mo
@@ -1,4 +1,4 @@
-within Buildings.Experimental.DHC.Plants.Cooling.Subsystems;
+within Buildings.DHC.Plants.Cooling.Subsystems;
 model CoolingTowersParallel
   "Multiple identical cooling towers in parallel connection"
   extends Buildings.Fluid.Interfaces.PartialTwoPortInterface(
diff --git a/Buildings/Experimental/DHC/Plants/Cooling/Subsystems/CoolingTowersWithBypass.mo b/Buildings/DHC/Plants/Cooling/Subsystems/CoolingTowersWithBypass.mo
similarity index 99%
rename from Buildings/Experimental/DHC/Plants/Cooling/Subsystems/CoolingTowersWithBypass.mo
rename to Buildings/DHC/Plants/Cooling/Subsystems/CoolingTowersWithBypass.mo
index 3f3b841dd9d..50c56ee00e9 100644
--- a/Buildings/Experimental/DHC/Plants/Cooling/Subsystems/CoolingTowersWithBypass.mo
+++ b/Buildings/DHC/Plants/Cooling/Subsystems/CoolingTowersWithBypass.mo
@@ -1,4 +1,4 @@
-within Buildings.Experimental.DHC.Plants.Cooling.Subsystems;
+within Buildings.DHC.Plants.Cooling.Subsystems;
 model CoolingTowersWithBypass
   "Cooling tower system with bypass valve"
   extends Buildings.Fluid.Interfaces.PartialTwoPortInterface(
@@ -74,7 +74,7 @@ model CoolingTowersWithBypass
     displayUnit="degC")
     "Leaving water temperature"
     annotation (Placement(transformation(extent={{100,20},{120,40}})));
-  Buildings.Experimental.DHC.Plants.Cooling.Subsystems.CoolingTowersParallel cooTowSys(
+  Buildings.DHC.Plants.Cooling.Subsystems.CoolingTowersParallel cooTowSys(
     redeclare final package Medium=Medium,
     final use_inputFilter=false,
     final num=num,
diff --git a/Buildings/Experimental/DHC/Plants/Cooling/Subsystems/Examples/BaseClasses/PartialCoolingTowersSubsystem.mo b/Buildings/DHC/Plants/Cooling/Subsystems/Examples/BaseClasses/PartialCoolingTowersSubsystem.mo
similarity index 96%
rename from Buildings/Experimental/DHC/Plants/Cooling/Subsystems/Examples/BaseClasses/PartialCoolingTowersSubsystem.mo
rename to Buildings/DHC/Plants/Cooling/Subsystems/Examples/BaseClasses/PartialCoolingTowersSubsystem.mo
index 26700804742..de4f6c8337c 100644
--- a/Buildings/Experimental/DHC/Plants/Cooling/Subsystems/Examples/BaseClasses/PartialCoolingTowersSubsystem.mo
+++ b/Buildings/DHC/Plants/Cooling/Subsystems/Examples/BaseClasses/PartialCoolingTowersSubsystem.mo
@@ -1,4 +1,4 @@
-within Buildings.Experimental.DHC.Plants.Cooling.Subsystems.Examples.BaseClasses;
+within Buildings.DHC.Plants.Cooling.Subsystems.Examples.BaseClasses;
 partial model PartialCoolingTowersSubsystem
   "Partial class for test models of subsystems"
 
@@ -156,8 +156,8 @@ Duplicate <a href=\"modelica://Buildings.Fluid.HeatExchangers.CoolingTowers.Exam
 Buildings.Fluid.HeatExchangers.CoolingTowers.Examples.BaseClasses.PartialStaticTwoPortCoolingTower</a><br/>
 Changed replaceable cooling tower model to <code>PartialTwoPortInterface</code>
 for reusability in
-<a href=\"modelica://Buildings.Experimental.DHC.Plants.Cooling.Subsystems.Examples\">
-Buildings.Experimental.DHC.Plants.Cooling.Subsystems.Examples</a>.
+<a href=\"modelica://Buildings.DHC.Plants.Cooling.Subsystems.Examples\">
+Buildings.DHC.Plants.Cooling.Subsystems.Examples</a>.
 </li>
 </ul>
 </html>"));
diff --git a/Buildings/Experimental/DHC/Plants/Cooling/Subsystems/Examples/BaseClasses/package.mo b/Buildings/DHC/Plants/Cooling/Subsystems/Examples/BaseClasses/package.mo
similarity index 58%
rename from Buildings/Experimental/DHC/Plants/Cooling/Subsystems/Examples/BaseClasses/package.mo
rename to Buildings/DHC/Plants/Cooling/Subsystems/Examples/BaseClasses/package.mo
index 20703c15c3f..0f1fd966e24 100644
--- a/Buildings/Experimental/DHC/Plants/Cooling/Subsystems/Examples/BaseClasses/package.mo
+++ b/Buildings/DHC/Plants/Cooling/Subsystems/Examples/BaseClasses/package.mo
@@ -1,4 +1,4 @@
-within Buildings.Experimental.DHC.Plants.Cooling.Subsystems.Examples;
+within Buildings.DHC.Plants.Cooling.Subsystems.Examples;
 package BaseClasses "Package with base classes"
   extends Modelica.Icons.BasesPackage;
 
@@ -7,6 +7,6 @@ package BaseClasses "Package with base classes"
     preferredView="info",
     Documentation(
       info="<html>
-<p>This package contains base classes that are used to construct the classes in <a href=\"modelica://Buildings.Experimental.DHC.Plants\">Buildings.Experimental.DHC.Plants</a>. </p>
+<p>This package contains base classes that are used to construct the classes in <a href=\"modelica://Buildings.DHC.Plants\">Buildings.DHC.Plants</a>. </p>
 </html>"));
 end BaseClasses;
diff --git a/Buildings/Experimental/DHC/Plants/Cooling/Subsystems/Examples/BaseClasses/package.order b/Buildings/DHC/Plants/Cooling/Subsystems/Examples/BaseClasses/package.order
similarity index 100%
rename from Buildings/Experimental/DHC/Plants/Cooling/Subsystems/Examples/BaseClasses/package.order
rename to Buildings/DHC/Plants/Cooling/Subsystems/Examples/BaseClasses/package.order
diff --git a/Buildings/Experimental/DHC/Plants/Cooling/Subsystems/Examples/CoolingTowersParallel.mo b/Buildings/DHC/Plants/Cooling/Subsystems/Examples/CoolingTowersParallel.mo
similarity index 81%
rename from Buildings/Experimental/DHC/Plants/Cooling/Subsystems/Examples/CoolingTowersParallel.mo
rename to Buildings/DHC/Plants/Cooling/Subsystems/Examples/CoolingTowersParallel.mo
index 41f96f9af15..c00a162ed08 100644
--- a/Buildings/Experimental/DHC/Plants/Cooling/Subsystems/Examples/CoolingTowersParallel.mo
+++ b/Buildings/DHC/Plants/Cooling/Subsystems/Examples/CoolingTowersParallel.mo
@@ -1,10 +1,10 @@
-within Buildings.Experimental.DHC.Plants.Cooling.Subsystems.Examples;
+within Buildings.DHC.Plants.Cooling.Subsystems.Examples;
 model CoolingTowersParallel
   "Example model for parallel cooling tower model"
   extends Modelica.Icons.Example;
   extends
-    Buildings.Experimental.DHC.Plants.Cooling.Subsystems.Examples.BaseClasses.PartialCoolingTowersSubsystem(
-    redeclare Buildings.Experimental.DHC.Plants.Cooling.Subsystems.CoolingTowersParallel tow(
+    Buildings.DHC.Plants.Cooling.Subsystems.Examples.BaseClasses.PartialCoolingTowersSubsystem(
+    redeclare Buildings.DHC.Plants.Cooling.Subsystems.CoolingTowersParallel tow(
       TAirInWB_nominal=273.15+25.55,
       TWatIn_nominal=273.15+35,
       dT_nominal=5.56,
@@ -65,13 +65,13 @@ equation
       StopTime=15724800,
       Tolerance=1e-06),
     __Dymola_Commands(
-      file="modelica://Buildings/Resources/Scripts/Dymola/Experimental/DHC/Plants/Cooling/Subsystems/Examples/CoolingTowersParallel.mos"
+      file="modelica://Buildings/Resources/Scripts/Dymola/DHC/Plants/Cooling/Subsystems/Examples/CoolingTowersParallel.mos"
       "Simulate and Plot"),
     Documentation(
       info="<html>
 <p>This model validates the parallel connected cooling tower subsystem in
-<a href=\"modelica://Buildings.Experimental.DHC.Plants.Cooling.Subsystems.CoolingTowersParallel\">
-Buildings.Experimental.DHC.Plants.Cooling.Subsystems.CoolingTowersParallel</a>.</p>
+<a href=\"modelica://Buildings.DHC.Plants.Cooling.Subsystems.CoolingTowersParallel\">
+Buildings.DHC.Plants.Cooling.Subsystems.CoolingTowersParallel</a>.</p>
 </html>",
       revisions="<html>
 <ul>
diff --git a/Buildings/Experimental/DHC/Plants/Cooling/Subsystems/Examples/CoolingTowersWithBypass.mo b/Buildings/DHC/Plants/Cooling/Subsystems/Examples/CoolingTowersWithBypass.mo
similarity index 74%
rename from Buildings/Experimental/DHC/Plants/Cooling/Subsystems/Examples/CoolingTowersWithBypass.mo
rename to Buildings/DHC/Plants/Cooling/Subsystems/Examples/CoolingTowersWithBypass.mo
index 6002ccc73e7..7941431ee99 100644
--- a/Buildings/Experimental/DHC/Plants/Cooling/Subsystems/Examples/CoolingTowersWithBypass.mo
+++ b/Buildings/DHC/Plants/Cooling/Subsystems/Examples/CoolingTowersWithBypass.mo
@@ -1,9 +1,9 @@
-within Buildings.Experimental.DHC.Plants.Cooling.Subsystems.Examples;
+within Buildings.DHC.Plants.Cooling.Subsystems.Examples;
 model CoolingTowersWithBypass
   "Example model for parallel cooling towers with bypass valve"
   extends Modelica.Icons.Example;
-  extends Buildings.Experimental.DHC.Plants.Cooling.Subsystems.Examples.BaseClasses.PartialCoolingTowersSubsystem(
-    redeclare Buildings.Experimental.DHC.Plants.Cooling.Subsystems.CoolingTowersWithBypass tow(
+  extends Buildings.DHC.Plants.Cooling.Subsystems.Examples.BaseClasses.PartialCoolingTowersSubsystem(
+    redeclare Buildings.DHC.Plants.Cooling.Subsystems.CoolingTowersWithBypass tow(
       dpValve_nominal = 6000,
       dp_nominal(displayUnit="Pa") = 6000,
       TAirInWB_nominal=273.15 + 25.55,
@@ -39,7 +39,7 @@ equation
       StopTime=10540800,
       Tolerance=1e-06),
     __Dymola_Commands(
-      file="modelica://Buildings/Resources/Scripts/Dymola/Experimental/DHC/Plants/Cooling/Subsystems/Examples/CoolingTowersWithBypass.mos"
+      file="modelica://Buildings/Resources/Scripts/Dymola/DHC/Plants/Cooling/Subsystems/Examples/CoolingTowersWithBypass.mos"
       "Simulate and Plot"),
     Documentation(
       revisions="<html>
@@ -52,7 +52,7 @@ First implementation.
 </html>",
       info="<html>
 <p>This model validates the parallel connected cooling tower subsystem in
-<a href=\"modelica://Buildings.Experimental.DHC.Plants.Cooling.Subsystems.CoolingTowersWithBypass\">
-Buildings.Experimental.DHC.Plants.Cooling.Subsystems.CoolingTowerWithBypass</a>.</p>
+<a href=\"modelica://Buildings.DHC.Plants.Cooling.Subsystems.CoolingTowersWithBypass\">
+Buildings.DHC.Plants.Cooling.Subsystems.CoolingTowerWithBypass</a>.</p>
 </html>"));
 end CoolingTowersWithBypass;
diff --git a/Buildings/Experimental/DHC/Plants/Cooling/Subsystems/Examples/package.mo b/Buildings/DHC/Plants/Cooling/Subsystems/Examples/package.mo
similarity index 58%
rename from Buildings/Experimental/DHC/Plants/Cooling/Subsystems/Examples/package.mo
rename to Buildings/DHC/Plants/Cooling/Subsystems/Examples/package.mo
index 52faf61152f..d0f2c1716fb 100644
--- a/Buildings/Experimental/DHC/Plants/Cooling/Subsystems/Examples/package.mo
+++ b/Buildings/DHC/Plants/Cooling/Subsystems/Examples/package.mo
@@ -1,4 +1,4 @@
-within Buildings.Experimental.DHC.Plants.Cooling.Subsystems;
+within Buildings.DHC.Plants.Cooling.Subsystems;
 package Examples "Example models integrating multiple components"
   extends Modelica.Icons.ExamplesPackage;
 
@@ -7,8 +7,8 @@ package Examples "Example models integrating multiple components"
       info="<html>
 <p>
 This package contains advanced examples illustrating the use of the models in
-<a href=\"modelica://Buildings.Experimental.DHC.Plants.Cooling.Subsystems\">
-Buildings.Experimental.DHC.Plants.Cooling.Subsystems</a>.
+<a href=\"modelica://Buildings.DHC.Plants.Cooling.Subsystems\">
+Buildings.DHC.Plants.Cooling.Subsystems</a>.
 </p>
 </html>"));
 end Examples;
diff --git a/Buildings/Experimental/DHC/Plants/Cooling/Subsystems/Examples/package.order b/Buildings/DHC/Plants/Cooling/Subsystems/Examples/package.order
similarity index 100%
rename from Buildings/Experimental/DHC/Plants/Cooling/Subsystems/Examples/package.order
rename to Buildings/DHC/Plants/Cooling/Subsystems/Examples/package.order
diff --git a/Buildings/Experimental/DHC/Plants/Cooling/Subsystems/package.mo b/Buildings/DHC/Plants/Cooling/Subsystems/package.mo
similarity index 86%
rename from Buildings/Experimental/DHC/Plants/Cooling/Subsystems/package.mo
rename to Buildings/DHC/Plants/Cooling/Subsystems/package.mo
index d348f9927b8..254f7aa63d4 100644
--- a/Buildings/Experimental/DHC/Plants/Cooling/Subsystems/package.mo
+++ b/Buildings/DHC/Plants/Cooling/Subsystems/package.mo
@@ -1,4 +1,4 @@
-within Buildings.Experimental.DHC.Plants.Cooling;
+within Buildings.DHC.Plants.Cooling;
 package Subsystems "Package of models for subsystems of cooling plants"
   extends Modelica.Icons.VariantsPackage;
 
diff --git a/Buildings/Experimental/DHC/Plants/Cooling/Subsystems/package.order b/Buildings/DHC/Plants/Cooling/Subsystems/package.order
similarity index 100%
rename from Buildings/Experimental/DHC/Plants/Cooling/Subsystems/package.order
rename to Buildings/DHC/Plants/Cooling/Subsystems/package.order
diff --git a/Buildings/Experimental/DHC/Plants/Cooling/package.mo b/Buildings/DHC/Plants/Cooling/package.mo
similarity index 87%
rename from Buildings/Experimental/DHC/Plants/Cooling/package.mo
rename to Buildings/DHC/Plants/Cooling/package.mo
index 071c9676af2..f7a5a898e4d 100644
--- a/Buildings/Experimental/DHC/Plants/Cooling/package.mo
+++ b/Buildings/DHC/Plants/Cooling/package.mo
@@ -1,4 +1,4 @@
-within Buildings.Experimental.DHC.Plants;
+within Buildings.DHC.Plants;
 package Cooling "Package of models for central cooling production"
   extends Modelica.Icons.VariantsPackage;
 
diff --git a/Buildings/Experimental/DHC/Plants/Cooling/package.order b/Buildings/DHC/Plants/Cooling/package.order
similarity index 100%
rename from Buildings/Experimental/DHC/Plants/Cooling/package.order
rename to Buildings/DHC/Plants/Cooling/package.order
diff --git a/Buildings/Experimental/DHC/Plants/Heating/SewageHeatRecovery.mo b/Buildings/DHC/Plants/Heating/SewageHeatRecovery.mo
similarity index 93%
rename from Buildings/Experimental/DHC/Plants/Heating/SewageHeatRecovery.mo
rename to Buildings/DHC/Plants/Heating/SewageHeatRecovery.mo
index 863e708473a..1001aa1d994 100644
--- a/Buildings/Experimental/DHC/Plants/Heating/SewageHeatRecovery.mo
+++ b/Buildings/DHC/Plants/Heating/SewageHeatRecovery.mo
@@ -1,13 +1,13 @@
-within Buildings.Experimental.DHC.Plants.Heating;
+within Buildings.DHC.Plants.Heating;
 model SewageHeatRecovery
   "Model for sewage heat recovery plant"
-  extends Buildings.Experimental.DHC.Plants.BaseClasses.PartialPlant(
+  extends Buildings.DHC.Plants.BaseClasses.PartialPlant(
     final have_fan=false,
     final have_pum=true,
     final have_eleHea=false,
     final have_eleCoo=false,
     final have_weaBus=false,
-    final typ=Buildings.Experimental.DHC.Types.DistrictSystemType.CombinedGeneration5);
+    final typ=Buildings.DHC.Types.DistrictSystemType.CombinedGeneration5);
 
   parameter Modelica.Units.SI.MassFlowRate mSew_flow_nominal
     "Sewage water nominal mass flow rate"
@@ -66,7 +66,7 @@ model SewageHeatRecovery
         extent={{10,-10},{-10,10}},
         rotation=0,
         origin={0,14})));
-  Buildings.Experimental.DHC.EnergyTransferStations.BaseClasses.Pump_m_flow pumDis(
+  Buildings.DHC.ETS.BaseClasses.Pump_m_flow pumDis(
     redeclare final package Medium=Medium,
     final m_flow_nominal=mDis_flow_nominal,
     final dp_nominal=dpDis_nominal,
@@ -86,7 +86,7 @@ model SewageHeatRecovery
       extent={{-10,-10},{10,10}},
       rotation=0,
       origin={-70,76})));
-  Buildings.Experimental.DHC.EnergyTransferStations.BaseClasses.Pump_m_flow pumSew(
+  Buildings.DHC.ETS.BaseClasses.Pump_m_flow pumSew(
     redeclare final package Medium=Medium,
     final m_flow_nominal=mSew_flow_nominal,
     final dp_nominal=dpSew_nominal,
@@ -106,7 +106,7 @@ model SewageHeatRecovery
         extent={{-6,6},{6,-6}},
         rotation=180,
         origin={-40,20})));
-  Buildings.Experimental.DHC.Networks.BaseClasses.DifferenceEnthalpyFlowRate senDifEntFlo(
+  Buildings.DHC.Networks.BaseClasses.DifferenceEnthalpyFlowRate senDifEntFlo(
     redeclare package Medium1 = Medium,
     final m_flow_nominal=mDis_flow_nominal)
     "Variation of enthalpy flow rate"
diff --git a/Buildings/Experimental/DHC/Plants/Heating/package.mo b/Buildings/DHC/Plants/Heating/package.mo
similarity index 86%
rename from Buildings/Experimental/DHC/Plants/Heating/package.mo
rename to Buildings/DHC/Plants/Heating/package.mo
index d76dc424148..599203576bc 100644
--- a/Buildings/Experimental/DHC/Plants/Heating/package.mo
+++ b/Buildings/DHC/Plants/Heating/package.mo
@@ -1,4 +1,4 @@
-within Buildings.Experimental.DHC.Plants;
+within Buildings.DHC.Plants;
 package Heating "Package of models for central heating production"
   extends Modelica.Icons.VariantsPackage;
 annotation (preferredView="info", Documentation(info="<html>
diff --git a/Buildings/Experimental/DHC/Plants/Heating/package.order b/Buildings/DHC/Plants/Heating/package.order
similarity index 100%
rename from Buildings/Experimental/DHC/Plants/Heating/package.order
rename to Buildings/DHC/Plants/Heating/package.order
diff --git a/Buildings/Experimental/DHC/Plants/Steam/BaseClasses/BoilerPolynomial.mo b/Buildings/DHC/Plants/Steam/BaseClasses/BoilerPolynomial.mo
similarity index 94%
rename from Buildings/Experimental/DHC/Plants/Steam/BaseClasses/BoilerPolynomial.mo
rename to Buildings/DHC/Plants/Steam/BaseClasses/BoilerPolynomial.mo
index ee9b808231b..a38df2095ec 100644
--- a/Buildings/Experimental/DHC/Plants/Steam/BaseClasses/BoilerPolynomial.mo
+++ b/Buildings/DHC/Plants/Steam/BaseClasses/BoilerPolynomial.mo
@@ -1,9 +1,9 @@
-within Buildings.Experimental.DHC.Plants.Steam.BaseClasses;
+within Buildings.DHC.Plants.Steam.BaseClasses;
 model BoilerPolynomial
   "A equilibrium boiler with water phase change from liquid to vapor, discharging
   saturated steam vapor, with the efficiency curve described by a polynomial."
   extends Buildings.BaseClasses.BaseIconLow;
-  extends Buildings.Experimental.DHC.BaseClasses.Steam.PartialTwoPortTwoMedium(
+  extends Buildings.DHC.BaseClasses.Steam.PartialTwoPortTwoMedium(
     redeclare final package Medium_a=MediumWat,
     redeclare final package Medium_b=MediumSte,
     final T_start=MediumSte.saturationTemperature(p_start));
@@ -82,7 +82,7 @@ model BoilerPolynomial
     T(start=T_start)) if not steadyDynamics
     "Heat capacity of boiler metal"
     annotation (Placement(transformation(extent={{-80,12},{-60,32}})));
-  Buildings.Experimental.DHC.Plants.Steam.BaseClasses.ControlVolumeEvaporation vol(
+  Buildings.DHC.Plants.Steam.BaseClasses.ControlVolumeEvaporation vol(
     redeclare final package MediumSte = MediumSte,
     redeclare final package MediumWat = MediumWat,
     final allowFlowReversal=allowFlowReversal,
@@ -253,18 +253,18 @@ result are within the green region in the below figure:
 </ul>
 
 <p align=\"center\">
-<img src=\"modelica://Buildings/Resources/Images/Experimental/DHC/Plants/Steam/BaseClasses/BoilerPolynomial.png\" border=\"1\"
+<img src=\"modelica://Buildings/Resources/Images/DHC/Plants/Steam/BaseClasses/BoilerPolynomial.png\" border=\"1\"
 alt=\"Boiler polynomial steam with blocks in green conditionally removed if steady state\"/>
 </p>
 <h4>Implementation</h4>
 <p>
 In order to improve the numerical efficiency, this model follows
 the split-medium approach using the
-<a href=\"modelica://Buildings.Experimental.DHC.BaseClasses.Steam.PartialTwoPortTwoMedium\">
-Buildings.Experimental.DHC.BaseClasses.Steam.PartialTwoPortTwoMedium</a> interface model.
+<a href=\"modelica://Buildings.DHC.BaseClasses.Steam.PartialTwoPortTwoMedium\">
+Buildings.DHC.BaseClasses.Steam.PartialTwoPortTwoMedium</a> interface model.
 The saturated mixing volume for an evaporation process
-<a href=\"modelica://Buildings.Experimental.DHC.Plants.Steam.BaseClasses.ControlVolumeEvaporation\">
-Buildings.Experimental.DHC.Plants.Steam.BaseClasses.ControlVolumeEvaporation</a>
+<a href=\"modelica://Buildings.DHC.Plants.Steam.BaseClasses.ControlVolumeEvaporation\">
+Buildings.DHC.Plants.Steam.BaseClasses.ControlVolumeEvaporation</a>
 represents the phase change process of water from liquid
 to vapor at equilibrium.
 </p>
diff --git a/Buildings/Experimental/DHC/Plants/Steam/BaseClasses/ControlVolumeEvaporation.mo b/Buildings/DHC/Plants/Steam/BaseClasses/ControlVolumeEvaporation.mo
similarity index 88%
rename from Buildings/Experimental/DHC/Plants/Steam/BaseClasses/ControlVolumeEvaporation.mo
rename to Buildings/DHC/Plants/Steam/BaseClasses/ControlVolumeEvaporation.mo
index bf49428b26d..ab7b96c0f24 100644
--- a/Buildings/Experimental/DHC/Plants/Steam/BaseClasses/ControlVolumeEvaporation.mo
+++ b/Buildings/DHC/Plants/Steam/BaseClasses/ControlVolumeEvaporation.mo
@@ -1,7 +1,7 @@
-within Buildings.Experimental.DHC.Plants.Steam.BaseClasses;
+within Buildings.DHC.Plants.Steam.BaseClasses;
 model ControlVolumeEvaporation
   "Control volume model exhibiting the evaporation process of water"
-  extends Buildings.Experimental.DHC.BaseClasses.Steam.PartialSaturatedControlVolume(
+  extends Buildings.DHC.BaseClasses.Steam.PartialSaturatedControlVolume(
     redeclare final package Medium_a=MediumWat,
     redeclare final package Medium_b=MediumSte,
     hSte(start = MediumSte.h_default),
@@ -53,8 +53,8 @@ This model represents an evaporation process of water with
 liquid and vapor phases in equilibrium and at a saturated state.
 Further information regarding the model formulation and assumptions
 are in the base class
-<a href=\"modelica://Buildings.Experimental.DHC.BaseClasses.Steam.PartialSaturatedControlVolume\">
-Buildings.Experimental.DHC.BaseClasses.Steam.PartialSaturatedControlVolume</a>.
+<a href=\"modelica://Buildings.DHC.BaseClasses.Steam.PartialSaturatedControlVolume\">
+Buildings.DHC.BaseClasses.Steam.PartialSaturatedControlVolume</a>.
 
 <h4>References </h4>
 <p>
diff --git a/Buildings/Experimental/DHC/Plants/Steam/BaseClasses/Examples/BoilerPolynomial.mo b/Buildings/DHC/Plants/Steam/BaseClasses/Examples/BoilerPolynomial.mo
similarity index 93%
rename from Buildings/Experimental/DHC/Plants/Steam/BaseClasses/Examples/BoilerPolynomial.mo
rename to Buildings/DHC/Plants/Steam/BaseClasses/Examples/BoilerPolynomial.mo
index 7f6ccec669d..2b767b768a0 100644
--- a/Buildings/Experimental/DHC/Plants/Steam/BaseClasses/Examples/BoilerPolynomial.mo
+++ b/Buildings/DHC/Plants/Steam/BaseClasses/Examples/BoilerPolynomial.mo
@@ -1,4 +1,4 @@
-within Buildings.Experimental.DHC.Plants.Steam.BaseClasses.Examples;
+within Buildings.DHC.Plants.Steam.BaseClasses.Examples;
 model BoilerPolynomial
   "Example model for the steam boiler with a polynomial efficiency curve"
   extends Modelica.Icons.Example;
@@ -48,7 +48,7 @@ model BoilerPolynomial
   Buildings.HeatTransfer.Sources.FixedTemperature TAmb(T=288.15)
     "Ambient temperature in boiler room"
     annotation (Placement(transformation(extent={{-40,40},{-20,60}})));
-  Buildings.Experimental.DHC.Plants.Steam.BaseClasses.BoilerPolynomial boiDyn(
+  Buildings.DHC.Plants.Steam.BaseClasses.BoilerPolynomial boiDyn(
     redeclare package MediumSte = MediumSte,
     redeclare package MediumWat = MediumWat,
     energyDynamics=Modelica.Fluid.Types.Dynamics.FixedInitial,
@@ -58,7 +58,7 @@ model BoilerPolynomial
     dp_nominal=dp_nominal)
     "Steam boiler with dynamic balance"
     annotation (Placement(transformation(extent={{-20,-20},{0,0}})));
-  Buildings.Experimental.DHC.Plants.Steam.BaseClasses.BoilerPolynomial boiSte(
+  Buildings.DHC.Plants.Steam.BaseClasses.BoilerPolynomial boiSte(
     redeclare package MediumSte = MediumSte,
     redeclare package MediumWat = MediumWat,
     energyDynamics=Modelica.Fluid.Types.Dynamics.SteadyState,
@@ -84,7 +84,7 @@ equation
           {30,-11},{40,-11}}, color={0,127,255}));
   connect(boiDyn.port_b, sin.ports[2])
     annotation (Line(points={{0,-10},{40,-10},{40,-9}}, color={0,127,255}));
-  annotation (__Dymola_Commands(file="modelica://Buildings/Resources/Scripts/Dymola/Experimental/DHC/Plants/Steam/BaseClasses/Examples/BoilerPolynomial.mos"
+  annotation (__Dymola_Commands(file="modelica://Buildings/Resources/Scripts/Dymola/DHC/Plants/Steam/BaseClasses/Examples/BoilerPolynomial.mos"
         "Simulate and plot"),
     experiment(Tolerance=1e-6, StopTime=3600),
     Documentation(info="<html>
diff --git a/Buildings/Experimental/DHC/Plants/Steam/BaseClasses/Examples/ControlVolumeEvaporation.mo b/Buildings/DHC/Plants/Steam/BaseClasses/Examples/ControlVolumeEvaporation.mo
similarity index 92%
rename from Buildings/Experimental/DHC/Plants/Steam/BaseClasses/Examples/ControlVolumeEvaporation.mo
rename to Buildings/DHC/Plants/Steam/BaseClasses/Examples/ControlVolumeEvaporation.mo
index be38d2cc544..bc04f8397e1 100644
--- a/Buildings/Experimental/DHC/Plants/Steam/BaseClasses/Examples/ControlVolumeEvaporation.mo
+++ b/Buildings/DHC/Plants/Steam/BaseClasses/Examples/ControlVolumeEvaporation.mo
@@ -1,4 +1,4 @@
-within Buildings.Experimental.DHC.Plants.Steam.BaseClasses.Examples;
+within Buildings.DHC.Plants.Steam.BaseClasses.Examples;
 model ControlVolumeEvaporation
   "Example model for heat transfer with the evaporation control volume"
   extends Modelica.Icons.Example;
@@ -11,7 +11,7 @@ model ControlVolumeEvaporation
 
   parameter Modelica.Units.SI.AbsolutePressure p_start = 1E6 "Initial pressure";
 
-  Buildings.Experimental.DHC.Plants.Steam.BaseClasses.ControlVolumeEvaporation volDyn(
+  Buildings.DHC.Plants.Steam.BaseClasses.ControlVolumeEvaporation volDyn(
     p_start=p_start,
     V=1,
     redeclare package MediumWat = MediumWat,
@@ -20,7 +20,7 @@ model ControlVolumeEvaporation
     energyDynamics=Modelica.Fluid.Types.Dynamics.FixedInitial,
     allowFlowReversal=true) "Dynamic volume"
     annotation (Placement(transformation(extent={{10,0},{30,-20}})));
-  Buildings.Experimental.DHC.Plants.Steam.BaseClasses.ControlVolumeEvaporation volSte(
+  Buildings.DHC.Plants.Steam.BaseClasses.ControlVolumeEvaporation volSte(
     V=1,
     redeclare package MediumWat = MediumWat,
     redeclare package MediumSte = MediumSte,
@@ -96,6 +96,6 @@ First implementation.
 </ul>
 </html>"),
 experiment(Tolerance=1E-6, StopTime=1.0),
-__Dymola_Commands(file="modelica://Buildings/Resources/Scripts/Dymola/Experimental/DHC/Plants/Steam/BaseClasses/Examples/ControlVolumeEvaporation.mos"
+__Dymola_Commands(file="modelica://Buildings/Resources/Scripts/Dymola/DHC/Plants/Steam/BaseClasses/Examples/ControlVolumeEvaporation.mos"
         "Simulate and plot"));
 end ControlVolumeEvaporation;
diff --git a/Buildings/Experimental/DHC/Plants/Steam/BaseClasses/Examples/package.mo b/Buildings/DHC/Plants/Steam/BaseClasses/Examples/package.mo
similarity index 60%
rename from Buildings/Experimental/DHC/Plants/Steam/BaseClasses/Examples/package.mo
rename to Buildings/DHC/Plants/Steam/BaseClasses/Examples/package.mo
index 3b72af8b732..ad7e35ef693 100644
--- a/Buildings/Experimental/DHC/Plants/Steam/BaseClasses/Examples/package.mo
+++ b/Buildings/DHC/Plants/Steam/BaseClasses/Examples/package.mo
@@ -1,12 +1,12 @@
-within Buildings.Experimental.DHC.Plants.Steam.BaseClasses;
+within Buildings.DHC.Plants.Steam.BaseClasses;
 package Examples "Collection of models that illustrate model use and test models"
   extends Modelica.Icons.ExamplesPackage;
 
 annotation (preferredView="info", Documentation(info="<html>
 <p>
 This package contains examples for the use of models that can be found in
-<a href=\"modelica://Buildings.Experimental.DHC.Plants.Steam.BaseClasses\">
-Buildings.Experimental.DHC.Plants.Steam.BaseClasses</a>.
+<a href=\"modelica://Buildings.DHC.Plants.Steam.BaseClasses\">
+Buildings.DHC.Plants.Steam.BaseClasses</a>.
 </p>
 </html>"));
 end Examples;
diff --git a/Buildings/Experimental/DHC/Plants/Steam/BaseClasses/Examples/package.order b/Buildings/DHC/Plants/Steam/BaseClasses/Examples/package.order
similarity index 100%
rename from Buildings/Experimental/DHC/Plants/Steam/BaseClasses/Examples/package.order
rename to Buildings/DHC/Plants/Steam/BaseClasses/Examples/package.order
diff --git a/Buildings/DHC/Plants/Steam/BaseClasses/package.mo b/Buildings/DHC/Plants/Steam/BaseClasses/package.mo
new file mode 100644
index 00000000000..6dd2b426a97
--- /dev/null
+++ b/Buildings/DHC/Plants/Steam/BaseClasses/package.mo
@@ -0,0 +1,12 @@
+within Buildings.DHC.Plants.Steam;
+package BaseClasses "Package with base classes for Buildings.DHC.Plants.Steam"
+  extends Modelica.Icons.BasesPackage;
+
+annotation (preferredView="info", Documentation(info="<html>
+<p>
+This package contains base classes that are used to construct the models in
+<a href=\"modelica://Buildings.DHC.Plants.Steam\">
+Buildings.DHC.Plants.Steam</a>.
+</p>
+</html>"));
+end BaseClasses;
diff --git a/Buildings/Experimental/DHC/Plants/Steam/BaseClasses/package.order b/Buildings/DHC/Plants/Steam/BaseClasses/package.order
similarity index 100%
rename from Buildings/Experimental/DHC/Plants/Steam/BaseClasses/package.order
rename to Buildings/DHC/Plants/Steam/BaseClasses/package.order
diff --git a/Buildings/Experimental/DHC/Plants/Steam/Examples/SingleBoiler.mo b/Buildings/DHC/Plants/Steam/Examples/SingleBoiler.mo
similarity index 91%
rename from Buildings/Experimental/DHC/Plants/Steam/Examples/SingleBoiler.mo
rename to Buildings/DHC/Plants/Steam/Examples/SingleBoiler.mo
index 1db129e5dc6..68336f824dc 100644
--- a/Buildings/Experimental/DHC/Plants/Steam/Examples/SingleBoiler.mo
+++ b/Buildings/DHC/Plants/Steam/Examples/SingleBoiler.mo
@@ -1,4 +1,4 @@
-within Buildings.Experimental.DHC.Plants.Steam.Examples;
+within Buildings.DHC.Plants.Steam.Examples;
 model SingleBoiler "Example model to demonstrate the single-boiler steam plant
   in a single closed loop"
   extends Modelica.Icons.Example;
@@ -36,7 +36,7 @@ model SingleBoiler "Example model to demonstrate the single-boiler steam plant
      dp=dpPip*{2,1,0}))
     "Performance data for condensate return pumps";
 
-  Buildings.Experimental.DHC.Plants.Steam.SingleBoiler pla(
+  Buildings.DHC.Plants.Steam.SingleBoiler pla(
     redeclare final package Medium = MediumWat,
     redeclare final package MediumHea_b = MediumSte,
     allowFlowReversal=true,
@@ -47,7 +47,7 @@ model SingleBoiler "Example model to demonstrate the single-boiler steam plant
     massDynamics=Modelica.Fluid.Types.Dynamics.FixedInitial)
     "Plant"
     annotation (Placement(transformation(extent={{-20,20},{0,40}})));
-  Buildings.Experimental.DHC.Loads.Steam.BaseClasses.ControlVolumeCondensation vol(
+  Buildings.DHC.Loads.Steam.BaseClasses.ControlVolumeCondensation vol(
     redeclare final package MediumSte = MediumSte,
     redeclare final package MediumWat = MediumWat,
     energyDynamics=Modelica.Fluid.Types.Dynamics.SteadyState,
@@ -62,7 +62,7 @@ model SingleBoiler "Example model to demonstrate the single-boiler steam plant
     final dp_nominal = dpPip)
     "Resistance in district network"
     annotation (Placement(transformation(extent={{0,-60},{-20,-40}})));
-  Buildings.Experimental.DHC.Loads.Steam.BaseClasses.SteamTrap steTra(
+  Buildings.DHC.Loads.Steam.BaseClasses.SteamTrap steTra(
     redeclare final package Medium = MediumWat,
     final m_flow_nominal=m_flow_nominal)
     "Steam trap"
@@ -123,12 +123,12 @@ equation
         coordinateSystem(preserveAspectRatio=false)),
     experiment(StopTime=86400, Tolerance=1e-6),
       __Dymola_Commands(file=
-    "modelica://Buildings/Resources/Scripts/Dymola/Experimental/DHC/Plants/Steam/Examples/SingleBoiler.mos"
+    "modelica://Buildings/Resources/Scripts/Dymola/DHC/Plants/Steam/Examples/SingleBoiler.mos"
     "Simulate and plot"),
     Documentation(info="<html>
 <p>This model validates the steam plant implemented in
-<a href=\"modelica://Buildings.Experimental.DHC.Plants.Steam.SingleBoiler\">
-Buildings.Experimental.DHC.Plants.Steam.SingleBoiler</a>.
+<a href=\"modelica://Buildings.DHC.Plants.Steam.SingleBoiler\">
+Buildings.DHC.Plants.Steam.SingleBoiler</a>.
 </p>
 </html>", revisions="<html>
 <ul>
diff --git a/Buildings/Experimental/DHC/Plants/Steam/Examples/package.mo b/Buildings/DHC/Plants/Steam/Examples/package.mo
similarity index 61%
rename from Buildings/Experimental/DHC/Plants/Steam/Examples/package.mo
rename to Buildings/DHC/Plants/Steam/Examples/package.mo
index e3fe2dcfb89..4b6c93a940b 100644
--- a/Buildings/Experimental/DHC/Plants/Steam/Examples/package.mo
+++ b/Buildings/DHC/Plants/Steam/Examples/package.mo
@@ -1,12 +1,12 @@
-within Buildings.Experimental.DHC.Plants.Steam;
+within Buildings.DHC.Plants.Steam;
 package Examples "Example models for steam plants"
   extends Modelica.Icons.ExamplesPackage;
 
   annotation (Documentation(info="<html>
 <p>
 This package contains advanced examples illustrating the use of the models in
-<a href=\"modelica://Buildings.Experimental.DHC.Plants.Steam\">
-Buildings.Experimental.DHC.Plants.Steam</a>.
+<a href=\"modelica://Buildings.DHC.Plants.Steam\">
+Buildings.DHC.Plants.Steam</a>.
 </p>
 </html>"));
 end Examples;
diff --git a/Buildings/Experimental/DHC/Plants/Steam/Examples/package.order b/Buildings/DHC/Plants/Steam/Examples/package.order
similarity index 100%
rename from Buildings/Experimental/DHC/Plants/Steam/Examples/package.order
rename to Buildings/DHC/Plants/Steam/Examples/package.order
diff --git a/Buildings/Experimental/DHC/Plants/Steam/SingleBoiler.mo b/Buildings/DHC/Plants/Steam/SingleBoiler.mo
similarity index 97%
rename from Buildings/Experimental/DHC/Plants/Steam/SingleBoiler.mo
rename to Buildings/DHC/Plants/Steam/SingleBoiler.mo
index 85c445ecead..4f900a37dc5 100644
--- a/Buildings/Experimental/DHC/Plants/Steam/SingleBoiler.mo
+++ b/Buildings/DHC/Plants/Steam/SingleBoiler.mo
@@ -1,8 +1,8 @@
-within Buildings.Experimental.DHC.Plants.Steam;
+within Buildings.DHC.Plants.Steam;
 model SingleBoiler "A generic steam plant with a single boiler that discharges
   saturated steam"
-  extends Buildings.Experimental.DHC.Plants.BaseClasses.PartialPlant(
-    final typ=Buildings.Experimental.DHC.Types.DistrictSystemType.HeatingGeneration1,
+  extends Buildings.DHC.Plants.BaseClasses.PartialPlant(
+    final typ=Buildings.DHC.Types.DistrictSystemType.HeatingGeneration1,
     redeclare replaceable package MediumHea_b=Buildings.Media.Steam,
     final have_fan=false,
     final have_pum=true,
@@ -161,8 +161,8 @@ model SingleBoiler "A generic steam plant with a single boiler that discharges
     "Feedwater pump"
     annotation (Placement(transformation(extent={{-40,-10},{-20,10}})));
 
-  // At start up, water leaves port_a, see Buildings.Experimental.DHC.Examples.Steam.SingleBoiler
-  Buildings.Experimental.DHC.Plants.Steam.BaseClasses.BoilerPolynomial boi(
+  // At start up, water leaves port_a, see Buildings.DHC.Examples.Steam.SingleBoiler
+  Buildings.DHC.Plants.Steam.BaseClasses.BoilerPolynomial boi(
     redeclare final package MediumSte = MediumHea_b,
     redeclare final package MediumWat = Medium,
     final energyDynamics=energyDynamics,
diff --git a/Buildings/Experimental/DHC/Plants/Steam/package.mo b/Buildings/DHC/Plants/Steam/package.mo
similarity index 85%
rename from Buildings/Experimental/DHC/Plants/Steam/package.mo
rename to Buildings/DHC/Plants/Steam/package.mo
index 31bcb2b0b5f..48f13321285 100644
--- a/Buildings/Experimental/DHC/Plants/Steam/package.mo
+++ b/Buildings/DHC/Plants/Steam/package.mo
@@ -1,4 +1,4 @@
-within Buildings.Experimental.DHC.Plants;
+within Buildings.DHC.Plants;
 package Steam "Package with models for steam plants"
   extends Modelica.Icons.VariantsPackage;
 
diff --git a/Buildings/Experimental/DHC/Plants/Steam/package.order b/Buildings/DHC/Plants/Steam/package.order
similarity index 100%
rename from Buildings/Experimental/DHC/Plants/Steam/package.order
rename to Buildings/DHC/Plants/Steam/package.order
diff --git a/Buildings/Experimental/DHC/Plants/package.mo b/Buildings/DHC/Plants/package.mo
similarity index 88%
rename from Buildings/Experimental/DHC/Plants/package.mo
rename to Buildings/DHC/Plants/package.mo
index b50f3b4c812..6dc35802630 100644
--- a/Buildings/Experimental/DHC/Plants/package.mo
+++ b/Buildings/DHC/Plants/package.mo
@@ -1,4 +1,4 @@
-within Buildings.Experimental.DHC;
+within Buildings.DHC;
 package Plants "Package of models for central plants"
   extends Modelica.Icons.VariantsPackage;
 
diff --git a/Buildings/Experimental/DHC/Plants/package.order b/Buildings/DHC/Plants/package.order
similarity index 100%
rename from Buildings/Experimental/DHC/Plants/package.order
rename to Buildings/DHC/Plants/package.order
diff --git a/Buildings/Experimental/DHC/Types.mo b/Buildings/DHC/Types.mo
similarity index 98%
rename from Buildings/Experimental/DHC/Types.mo
rename to Buildings/DHC/Types.mo
index 98ba25f0704..9e8c9f6021e 100644
--- a/Buildings/Experimental/DHC/Types.mo
+++ b/Buildings/DHC/Types.mo
@@ -1,4 +1,4 @@
-within Buildings.Experimental.DHC;
+within Buildings.DHC;
 package Types  "Package with type definitions"
   extends Modelica.Icons.TypesPackage;
 
diff --git a/Buildings/Experimental/DHC/UsersGuide.mo b/Buildings/DHC/UsersGuide.mo
similarity index 68%
rename from Buildings/Experimental/DHC/UsersGuide.mo
rename to Buildings/DHC/UsersGuide.mo
index 4b0b252940f..f2739560fa2 100644
--- a/Buildings/Experimental/DHC/UsersGuide.mo
+++ b/Buildings/DHC/UsersGuide.mo
@@ -1,11 +1,11 @@
-within Buildings.Experimental.DHC;
+within Buildings.DHC;
 package UsersGuide
   extends Modelica.Icons.Information;
   annotation (preferredView="info",
   Documentation(info="<html>
 <h4>Overview</h4>
 <p>
-The package <code>Buildings.Experimental.DHC</code> consists of models
+The package <code>Buildings.DHC</code> consists of models
 for district heating and cooling (DHC) systems. The package contains models
 at the component, sub-system, and system level, which can be used as
 templates or for generating custom system models. Generally, the
@@ -21,8 +21,8 @@ primary sub-systems each with their own sub-packages
 as described in the table below:
 Energy Transfer Stations (ETS), Loads, Networks, and Plants.
 In addition to these sub-packages, the sub-package
-<a href=\"modelica://Buildings.Experimental.DHC.Examples\">
-Buildings.Experimental.DHC.Examples</a>
+<a href=\"modelica://Buildings.DHC.Examples\">
+Buildings.DHC.Examples</a>
 contains system models which may be used as examples or templates.
 </p>
 
@@ -32,29 +32,29 @@ contains system models which may be used as examples or templates.
 <th>Description</th>
 </tr>
 <tr>
-  <td><a href=\"modelica://Buildings.Experimental.DHC.EnergyTransferStations\">
-      Buildings.Experimental.DHC.EnergyTransferStations</a></td>
+  <td><a href=\"modelica://Buildings.DHC.ETS\">
+      Buildings.DHC.ETS</a></td>
   <td>Connection point between a building and district network which contains
       physical components such as heat exchangers, heat pumps, pipes, valves,
       sensors, and pumps, as well as control logic based on flow rate,
       temperature, and/or pressure measurements.</td>
 </tr>
 <tr>
-  <td><a href=\"modelica://Buildings.Experimental.DHC.Loads\">
-      Buildings.Experimental.DHC.Loads</a></td>
+  <td><a href=\"modelica://Buildings.DHC.Loads\">
+      Buildings.DHC.Loads</a></td>
   <td>Timeseries or physics-based representation of space heating and cooling
       and domestic hot water loads in buildings, and connected to an ETS.</td>
 </tr>
 <tr>
-  <td><a href=\"modelica://Buildings.Experimental.DHC.Networks\">
-      Buildings.Experimental.DHC.Networks</a></td>
+  <td><a href=\"modelica://Buildings.DHC.Networks\">
+      Buildings.DHC.Networks</a></td>
   <td>Distribution system between buildings and plants which contains
       distribution pipes and service lines to the
       energy transfer stations.</td>
 </tr>
 <tr>
-  <td><a href=\"modelica://Buildings.Experimental.DHC.Plants\">
-      Buildings.Experimental.DHC.Plants</a>
+  <td><a href=\"modelica://Buildings.DHC.Plants\">
+      Buildings.DHC.Plants</a>
   </td>
   <td>Sources of cooling or heating for the DHC such as boilers, chillers,
       heat pumps, waste heat, tank storage, and geothermal storage.
@@ -67,7 +67,7 @@ sub-systems and offers concrete example systems which can be modeled
 with concrete implementation of the abstractions.
 </p>
 <p align=\"center\">
-<img alt=\"image\" src=\"modelica://Buildings/Resources/Images/Experimental/DHC/UserGuide/DHC_Package_Concept.png\"/>
+<img alt=\"image\" src=\"modelica://Buildings/Resources/Images/DHC/UserGuide/DHC_Package_Concept.png\"/>
 </p>
 
 <p>
@@ -119,26 +119,26 @@ documentation of the model and subpackages for further modeling and implementati
     </td>
 </tr>
 <tr><td colspan=\"3\">
-    <a href=\"modelica://Buildings.Experimental.DHC.EnergyTransferStations\">
-    Buildings.Experimental.DHC.EnergyTransferStations</a>
+    <a href=\"modelica://Buildings.DHC.ETS\">
+    Buildings.DHC.ETS</a>
     </td>
 </tr>
 <tr><td valign=\"top\" rowspan=\"3\">Combined
     </td>
     <td valign=\"top\">
-    <a href=\"modelica://Buildings.Experimental.DHC.EnergyTransferStations.Combined.ChillerBorefield\">ChillerBorefield</a>
+    <a href=\"modelica://Buildings.DHC.ETS.Combined.ChillerBorefield\">ChillerBorefield</a>
     </td>
     <td valign=\"top\">ETS with heat recovery chiller and optional borefield.
     </td>
 </tr>
 <tr><td valign=\"top\">
-    <a href=\"modelica://Buildings.Experimental.DHC.EnergyTransferStations.Combined.HeatPumpHeatExchanger\">HeatPumpHeatExchanger</a>
+    <a href=\"modelica://Buildings.DHC.ETS.Combined.HeatPumpHeatExchanger\">HeatPumpHeatExchanger</a>
     </td>
     <td valign=\"top\">ETS with heat pump for heating, heat pump for domestic hot water, and compressor-less cooling by heat exchanger.
     </td>
 </tr>
 <tr><td valign=\"top\">
-    <a href=\"modelica://Buildings.Experimental.DHC.EnergyTransferStations.Combined.HeatPumpHeatExchangerDHWTank\">
+    <a href=\"modelica://Buildings.DHC.ETS.Combined.HeatPumpHeatExchangerDHWTank\">
     HeatPumpHeatExchangerDHWTank</a>
     </td>
     <td valign=\"top\">
@@ -148,12 +148,12 @@ documentation of the model and subpackages for further modeling and implementati
 </tr>
 <tr><td valign=\"top\" rowspan=\"2\">Cooling
     </td>
-    <td valign=\"top\"><a href=\"modelica://Buildings.Experimental.DHC.EnergyTransferStations.Cooling.Direct\">Direct</a>
+    <td valign=\"top\"><a href=\"modelica://Buildings.DHC.ETS.Cooling.Direct\">Direct</a>
     </td>
     <td valign=\"top\">ETS with direct connection and district return water temperature control. In-building pumping not modeled.
     </td>
 </tr>
-<tr><td valign=\"top\"><a href=\"modelica://Buildings.Experimental.DHC.EnergyTransferStations.Cooling.Indirect\">Indirect</a>
+<tr><td valign=\"top\"><a href=\"modelica://Buildings.DHC.ETS.Cooling.Indirect\">Indirect</a>
     </td>
     <td valign=\"top\">ETS with indirect connection with heat exchanger and building supply water temperature control.
     In-building pumping not modeled.
@@ -161,12 +161,12 @@ documentation of the model and subpackages for further modeling and implementati
 </tr>
 <tr><td valign=\"top\" rowspan=\"2\">Heating
     </td>
-    <td valign=\"top\"><a href=\"modelica://Buildings.Experimental.DHC.EnergyTransferStations.Heating.Direct\">Direct</a>
+    <td valign=\"top\"><a href=\"modelica://Buildings.DHC.ETS.Heating.Direct\">Direct</a>
     </td>
     <td valign=\"top\">ETS with direct connection and district return water temperature control. In-building pumping not modeled.
     </td>
 </tr>
-<tr><td valign=\"top\"><a href=\"modelica://Buildings.Experimental.DHC.EnergyTransferStations.Heating.Indirect\">Indirect</a>
+<tr><td valign=\"top\"><a href=\"modelica://Buildings.DHC.ETS.Heating.Indirect\">Indirect</a>
     </td>
     <td valign=\"top\">ETS with indirect connection with heat exchanger and building supply water temperature control.
     In-building pumping not modeled.
@@ -174,14 +174,14 @@ documentation of the model and subpackages for further modeling and implementati
 </tr>
 
 <tr><td colspan=\"3\">
-    <a href=\"modelica://Buildings.Experimental.DHC.Loads\">
-    Buildings.Experimental.DHC.Loads</a>
+    <a href=\"modelica://Buildings.DHC.Loads\">
+    Buildings.DHC.Loads</a>
     </td>
 </tr>
 <tr><td valign=\"top\" rowspan=\"2\">Combined
     </td>
     <td valign=\"top\">
-    <a href=\"modelica://Buildings.Experimental.DHC.Loads.Combined.BuildingTimeSeriesWithETS\">BuildingTimeSeriesWithETS</a>
+    <a href=\"modelica://Buildings.DHC.Loads.Combined.BuildingTimeSeriesWithETS\">BuildingTimeSeriesWithETS</a>
     </td>
     <td valign=\"top\">
     Building with loads provided as time series, connected to an ETS with heat pump for space heating, heat pump for domestic hot water,
@@ -189,7 +189,7 @@ documentation of the model and subpackages for further modeling and implementati
     </td>
 </tr>
 <tr><td valign=\"top\">
-    <a href=\"modelica://Buildings.Experimental.DHC.Loads.Combined.BuildingTimeSeriesWithETSWithDHWTank\">
+    <a href=\"modelica://Buildings.DHC.Loads.Combined.BuildingTimeSeriesWithETSWithDHWTank\">
     BuildingTimeSeriesWithETSWithDHWTank</a>
     </td>
     <td valign=\"top\">
@@ -200,7 +200,7 @@ documentation of the model and subpackages for further modeling and implementati
 <tr><td valign=\"top\" rowspan=\"1\">Cooling
     </td>
     <td valign=\"top\">
-    <a href=\"modelica://Buildings.Experimental.DHC.Loads.Cooling.BuildingTimeSeriesWithETS\">BuildingTimeSeriesWithETS</a>
+    <a href=\"modelica://Buildings.DHC.Loads.Cooling.BuildingTimeSeriesWithETS\">BuildingTimeSeriesWithETS</a>
     </td>
     <td valign=\"top\">
     Building with loads provided as time series, connected to an ETS with direct connection for chilled water supply to the building.
@@ -209,7 +209,7 @@ documentation of the model and subpackages for further modeling and implementati
 <tr><td valign=\"top\" rowspan=\"1\">Heating
     </td>
     <td valign=\"top\">
-    <a href=\"modelica://Buildings.Experimental.DHC.Loads.Heating.BuildingTimeSeriesWithETS\">BuildingTimeSeriesWithETS</a>
+    <a href=\"modelica://Buildings.DHC.Loads.Heating.BuildingTimeSeriesWithETS\">BuildingTimeSeriesWithETS</a>
     </td>
     <td valign=\"top\">
     Building with loads provided as time series, connected to an ETS with direct connection for heating water supply to the building.
@@ -218,7 +218,7 @@ documentation of the model and subpackages for further modeling and implementati
 <tr><td valign=\"top\" rowspan=\"3\">HotWater
     </td>
     <td valign=\"top\">
-    <a href=\"modelica://Buildings.Experimental.DHC.Loads.HotWater.DirectHeatExchangerWithElectricHeat\">
+    <a href=\"modelica://Buildings.DHC.Loads.HotWater.DirectHeatExchangerWithElectricHeat\">
     DirectHeatExchangerWithElectricHeat</a>
     </td>
     <td valign=\"top\">
@@ -226,7 +226,7 @@ documentation of the model and subpackages for further modeling and implementati
     </td>
 </tr>
 <tr><td valign=\"top\">
-    <a href=\"modelica://Buildings.Experimental.DHC.Loads.HotWater.StorageTankWithExternalHeatExchanger\">
+    <a href=\"modelica://Buildings.DHC.Loads.HotWater.StorageTankWithExternalHeatExchanger\">
     StorageTankWithExternalHeatExchanger</a>
     </td>
     <td valign=\"top\">
@@ -234,7 +234,7 @@ documentation of the model and subpackages for further modeling and implementati
     </td>
 </tr>
 <tr><td valign=\"top\">
-    <a href=\"modelica://Buildings.Experimental.DHC.Loads.HotWater.ThermostaticMixingValve\">ThermostaticMixingValve</a>
+    <a href=\"modelica://Buildings.DHC.Loads.HotWater.ThermostaticMixingValve\">ThermostaticMixingValve</a>
     </td>
     <td valign=\"top\">A model for a thermostatic mixing valve.
     </td>
@@ -242,7 +242,7 @@ documentation of the model and subpackages for further modeling and implementati
 <tr><td valign=\"top\" rowspan=\"1\">Steam
     </td>
     <td valign=\"top\">
-    <a href=\"modelica://Buildings.Experimental.DHC.Loads.Steam.BuildingTimeSeriesAtETS\">BuildingTimeSeriesAtETS</a>
+    <a href=\"modelica://Buildings.DHC.Loads.Steam.BuildingTimeSeriesAtETS\">BuildingTimeSeriesAtETS</a>
     </td>
     <td valign=\"top\">
     Steam heating building interconnection with the district piping only and the load at the ETS provided as a time series.
@@ -250,35 +250,35 @@ documentation of the model and subpackages for further modeling and implementati
 </tr>
 
 <tr><td colspan=\"3\">
-    <a href=\"modelica://Buildings.Experimental.DHC.Networks\">
-    Buildings.Experimental.DHC.Networks</a>
+    <a href=\"modelica://Buildings.DHC.Networks\">
+    Buildings.DHC.Networks</a>
     </td>
 </tr>
 <tr><td valign=\"top\" rowspan=\"4\">
     </td>
     <td valign=\"top\">
-    <a href=\"modelica://Buildings.Experimental.DHC.Networks.Distribution1PipePlugFlow_v\">Distribution1PipePlugFlow_v</a>
+    <a href=\"modelica://Buildings.DHC.Networks.Distribution1PipePlugFlow_v\">Distribution1PipePlugFlow_v</a>
     </td>
     <td valign=\"top\">
     1-Pipe distribution network with fluid heat transfer modeled in the main lines between ETS determined by external model (e.g. ground) and flow friction by nominal velocity.
     </td>
 </tr>
 <tr><td valign=\"top\">
-    <a href=\"modelica://Buildings.Experimental.DHC.Networks.Distribution1Pipe_R\">Distribution1Pipe_R</a>
+    <a href=\"modelica://Buildings.DHC.Networks.Distribution1Pipe_R\">Distribution1Pipe_R</a>
     </td>
     <td valign=\"top\">
     1-Pipe distribution network with flow friction modeled in the main lines between ETS determined by pressure drop per length.
     </td>
 </tr>
 <tr><td valign=\"top\">
-    <a href=\"modelica://Buildings.Experimental.DHC.Networks.Distribution2PipePlugFlow_v\">Distribution2PipePlugFlow_v</a>
+    <a href=\"modelica://Buildings.DHC.Networks.Distribution2PipePlugFlow_v\">Distribution2PipePlugFlow_v</a>
     </td>
     <td valign=\"top\">
     2-Pipe distribution network with fluid heat transfer modeled in the main lines between ETS determined by external model (e.g. ground) and flow friction by nominal velocity.
     </td>
 </tr>
 <tr><td valign=\"top\">
-    <a href=\"modelica://Buildings.Experimental.DHC.Networks.Distribution2Pipe_R\">Distribution2Pipe_R</a>
+    <a href=\"modelica://Buildings.DHC.Networks.Distribution2Pipe_R\">Distribution2Pipe_R</a>
     </td>
     <td valign=\"top\">
     2-Pipe distribution network with flow friction modeled in the main lines between ETS determined by pressure drop per length.
@@ -287,7 +287,7 @@ documentation of the model and subpackages for further modeling and implementati
 <tr><td valign=\"top\" rowspan=\"1\">Steam
     </td>
     <td valign=\"top\">
-    <a href=\"modelica://Buildings.Experimental.DHC.Networks.Steam.DistributionCondensatePipe\">DistributionCondensatePipe</a>
+    <a href=\"modelica://Buildings.DHC.Networks.Steam.DistributionCondensatePipe\">DistributionCondensatePipe</a>
     </td>
     <td valign=\"top\">
     2-Pipe distribution network with steam supply and condensate return using a fixed resistance pipe model for condensate returns.
@@ -295,14 +295,14 @@ documentation of the model and subpackages for further modeling and implementati
 </tr>
 
 <tr><td colspan=\"3\">
-    <a href=\"modelica://Buildings.Experimental.DHC.Plants\">
-    Buildings.Experimental.DHC.Plants</a>
+    <a href=\"modelica://Buildings.DHC.Plants\">
+    Buildings.DHC.Plants</a>
     </td>
 </tr>
 <tr><td valign=\"top\" rowspan=\"1\">Combined
     </td>
     <td valign=\"top\">
-    <a href=\"modelica://Buildings.Experimental.DHC.Plants.Combined.AllElectricCWStorage\">AllElectricCWStorage</a>
+    <a href=\"modelica://Buildings.DHC.Plants.Combined.AllElectricCWStorage\">AllElectricCWStorage</a>
     </td>
     <td valign=\"top\">
     All-electric chilled water and heating water production plant with heat recovery chillers and condenser water storage.
@@ -311,13 +311,13 @@ documentation of the model and subpackages for further modeling and implementati
 <tr><td valign=\"top\" rowspan=\"2\">Cooling
     </td>
     <td valign=\"top\">
-    <a href=\"modelica://Buildings.Experimental.DHC.Plants.Cooling.ElectricChillerParallel\">ElectricChillerParallel</a>
+    <a href=\"modelica://Buildings.DHC.Plants.Cooling.ElectricChillerParallel\">ElectricChillerParallel</a>
     </td>
     <td valign=\"top\">Chilled water production plant with parallel chillers and parallel cooling towers.
     </td>
 </tr>
 <tr><td valign=\"top\">
-    <a href=\"modelica://Buildings.Experimental.DHC.Plants.Cooling.StoragePlant\">StoragePlant</a>
+    <a href=\"modelica://Buildings.DHC.Plants.Cooling.StoragePlant\">StoragePlant</a>
     </td>
     <td valign=\"top\">
     Chilled water storage tank system which can be charged by local chiller or remotely from district.
@@ -326,40 +326,40 @@ documentation of the model and subpackages for further modeling and implementati
 <tr><td valign=\"top\" rowspan=\"1\">Heating
     </td>
     <td valign=\"top\">
-    <a href=\"modelica://Buildings.Experimental.DHC.Plants.Heating.SewageHeatRecovery\">SewageHeatRecovery</a>
+    <a href=\"modelica://Buildings.DHC.Plants.Heating.SewageHeatRecovery\">SewageHeatRecovery</a>
     </td>
     <td valign=\"top\">Heating water production plant using sewage heat recovery.
     </td>
 </tr>
 <tr><td valign=\"top\" rowspan=\"1\">Steam
     </td>
-    <td valign=\"top\"><a href=\"modelica://Buildings.Experimental.DHC.Plants.Steam.SingleBoiler\">SingleBoiler</a>
+    <td valign=\"top\"><a href=\"modelica://Buildings.DHC.Plants.Steam.SingleBoiler\">SingleBoiler</a>
     </td>
     <td valign=\"top\">Steam plant with a single boiler that discharges saturated steam.
     </td>
 </tr>
 
 <tr><td colspan=\"3\">
-    <a href=\"modelica://Buildings.Experimental.DHC.Examples\">
-    Buildings.Experimental.DHC.Examples</a>
+    <a href=\"modelica://Buildings.DHC.Examples\">
+    Buildings.DHC.Examples</a>
     </td>
 </tr>
 <tr><td valign=\"top\" rowspan=\"3\">Combined
     </td>
     <td valign=\"top\">
-    <a href=\"modelica://Buildings.Experimental.DHC.Examples.Combined.SeriesConstantFlow\">SeriesConstantFlow</a>
+    <a href=\"modelica://Buildings.DHC.Examples.Combined.SeriesConstantFlow\">SeriesConstantFlow</a>
     </td>
     <td valign=\"top\">Example of ambient network, so-called <i>Reservoir Network</i>, with constant district water mass flow rate.
     </td>
 </tr>
 <tr><td valign=\"top\">
-    <a href=\"modelica://Buildings.Experimental.DHC.Examples.Combined.SeriesVariableFlow\">SeriesVariableFlow</a>
+    <a href=\"modelica://Buildings.DHC.Examples.Combined.SeriesVariableFlow\">SeriesVariableFlow</a>
     </td>
     <td valign=\"top\">Example of ambient network, so-called <i>Reservoir Network</i>, with variable district water mass flow rate.
     </td>
 </tr>
 <tr><td valign=\"top\">
-    <a href=\"modelica://Buildings.Experimental.DHC.Examples.Combined.SeriesVariableFlowAgentControl\">SeriesVariableFlowAgentControl</a>
+    <a href=\"modelica://Buildings.DHC.Examples.Combined.SeriesVariableFlowAgentControl\">SeriesVariableFlowAgentControl</a>
     </td>
     <td valign=\"top\">Example of ambient network, so-called <i>Reservoir Network</i>,
     with variable district water mass flow rate with updated agent controller.
@@ -368,7 +368,7 @@ documentation of the model and subpackages for further modeling and implementati
 <tr><td valign=\"top\" rowspan=\"1\">Cooling
     </td>
     <td valign=\"top\">
-    <a href=\"modelica://Buildings.Experimental.DHC.Examples.Cooling.ElectricChillersDirectETS\">ElectricChillersDirectETS</a>
+    <a href=\"modelica://Buildings.DHC.Examples.Cooling.ElectricChillersDirectETS\">ElectricChillersDirectETS</a>
     </td>
     <td valign=\"top\">
     Example model for district cooling system with an electric chiller plant and a direct controlled ETS at each building.
@@ -376,7 +376,7 @@ documentation of the model and subpackages for further modeling and implementati
 </tr>
 <tr><td valign=\"top\" rowspan=\"1\">Steam
     </td>
-    <td valign=\"top\"><a href=\"modelica://Buildings.Experimental.DHC.Examples.Steam.SingleBoiler\">SingleBoiler</a>
+    <td valign=\"top\"><a href=\"modelica://Buildings.DHC.Examples.Steam.SingleBoiler\">SingleBoiler</a>
     </td>
     <td valign=\"top\">
     Example model for a steam district heating system with a central plant boiler producing steam that is distributed to each building.
diff --git a/Buildings/Experimental/DHC/package.mo b/Buildings/DHC/package.mo
similarity index 90%
rename from Buildings/Experimental/DHC/package.mo
rename to Buildings/DHC/package.mo
index 63d724aaeca..b2d6086c307 100644
--- a/Buildings/Experimental/DHC/package.mo
+++ b/Buildings/DHC/package.mo
@@ -1,4 +1,4 @@
-within Buildings.Experimental;
+within Buildings;
 package DHC "Models for district heating and cooling systems"
   extends Modelica.Icons.VariantsPackage;
 
diff --git a/Buildings/Experimental/DHC/package.order b/Buildings/DHC/package.order
similarity index 72%
rename from Buildings/Experimental/DHC/package.order
rename to Buildings/DHC/package.order
index 9a56ac67235..5327c1d3f7b 100644
--- a/Buildings/Experimental/DHC/package.order
+++ b/Buildings/DHC/package.order
@@ -1,5 +1,5 @@
 UsersGuide
-EnergyTransferStations
+ETS
 Loads
 Networks
 Plants
diff --git a/Buildings/Examples/VAVReheat/BaseClasses/Controls/SystemHysteresis.mo b/Buildings/Examples/VAVReheat/BaseClasses/Controls/SystemHysteresis.mo
index 282849c1314..05023567754 100644
--- a/Buildings/Examples/VAVReheat/BaseClasses/Controls/SystemHysteresis.mo
+++ b/Buildings/Examples/VAVReheat/BaseClasses/Controls/SystemHysteresis.mo
@@ -93,12 +93,12 @@ equation
         Ellipse(
           extent={{71,7},{85,-7}},
           lineColor=DynamicSelect({235,235,235},
-            if truFalHol.y then
+            if truFalHol1.y then
               {0,255,0}
             else
               {235,235,235}),
           fillColor=DynamicSelect({235,235,235},
-            if truFalHol.y then
+            if truFalHol1.y then
               {0,255,0}
             else
               {235,235,235}),
@@ -106,12 +106,12 @@ equation
         Ellipse(
           extent={{-83,7},{-69,-7}},
           lineColor=DynamicSelect({235,235,235},
-            if truFalHol.u then
+            if truFalHol1.u then
               {0,255,0}
             else
               {235,235,235}),
           fillColor=DynamicSelect({235,235,235},
-            if truFalHol.u then
+            if truFalHol1.u then
               {0,255,0}
             else
               {235,235,235}),
@@ -127,6 +127,10 @@ Block that ensure that the system runs for a minimum time once it is switched on
 </html>", revisions="<html>
 <ul>
 <li>
+April 6, 2024, by Michael Wetter:<br/>
+Corrected wrong annotation.
+</li>
+<li>
 January 31, 2023, by Jianjun Hu:<br/>
 Added a true delay block to avoid triggering the pump operation by a spike input.
 </li>
diff --git a/Buildings/Experimental/DHC/EnergyTransferStations/Combined/Controls/BaseClasses/package.mo b/Buildings/Experimental/DHC/EnergyTransferStations/Combined/Controls/BaseClasses/package.mo
deleted file mode 100644
index 606b62b9cfd..00000000000
--- a/Buildings/Experimental/DHC/EnergyTransferStations/Combined/Controls/BaseClasses/package.mo
+++ /dev/null
@@ -1,15 +0,0 @@
-within Buildings.Experimental.DHC.EnergyTransferStations.Combined.Controls;
-package BaseClasses "Package with base classes"
-  extends Modelica.Icons.BasesPackage;
-
-  annotation (
-    preferredView="info",
-    Documentation(
-      info="<html>
-<p>
-This package contains base classes that are used to construct the classes in
-<a href=\"modelica://Buildings.Experimental.DHC.EnergyTransferStations.Combined.Controls\">
-Buildings.Experimental.DHC.EnergyTransferStations.Combined.Controls</a>.
-</p>
-</html>"));
-end BaseClasses;
diff --git a/Buildings/Experimental/DHC/EnergyTransferStations/Combined/Subsystems/Validation/package.mo b/Buildings/Experimental/DHC/EnergyTransferStations/Combined/Subsystems/Validation/package.mo
deleted file mode 100644
index b3a0467707a..00000000000
--- a/Buildings/Experimental/DHC/EnergyTransferStations/Combined/Subsystems/Validation/package.mo
+++ /dev/null
@@ -1,14 +0,0 @@
-within Buildings.Experimental.DHC.EnergyTransferStations.Combined.Subsystems;
-package Validation "Collection of validation models"
-  extends Modelica.Icons.ExamplesPackage;
-
-  annotation (
-    Documentation(
-      info="<html>
-<p>
-This package contains validation models for the classes in
-<a href=\"modelica://Buildings.Experimental.DHC.EnergyTransferStations.Combined.Subsystems\">
-Buildings.Experimental.DHC.EnergyTransferStations.Combined.Subsystems</a>.
-</p>
-</html>"));
-end Validation;
diff --git a/Buildings/Experimental/DHC/EnergyTransferStations/Combined/Validation/BaseClasses/package.mo b/Buildings/Experimental/DHC/EnergyTransferStations/Combined/Validation/BaseClasses/package.mo
deleted file mode 100644
index f35b9964293..00000000000
--- a/Buildings/Experimental/DHC/EnergyTransferStations/Combined/Validation/BaseClasses/package.mo
+++ /dev/null
@@ -1,14 +0,0 @@
-within Buildings.Experimental.DHC.EnergyTransferStations.Combined.Validation;
-package BaseClasses "Package with base classes"
-  extends Modelica.Icons.BasesPackage;
-
-  annotation (
-    Documentation(
-      info="<html>
-<p>
-This package contains base classes that are used to construct the classes in
-<a href=\"modelica://Buildings.Experimental.DHC.EnergyTransferStations.Combined.Validation\">
-Buildings.Experimental.DHC.EnergyTransferStations.Combined.Validation</a>.
-</p>
-</html>"));
-end BaseClasses;
diff --git a/Buildings/Experimental/DHC/Examples/Combined/BaseClasses/package.mo b/Buildings/Experimental/DHC/Examples/Combined/BaseClasses/package.mo
deleted file mode 100644
index 90dd78f48c3..00000000000
--- a/Buildings/Experimental/DHC/Examples/Combined/BaseClasses/package.mo
+++ /dev/null
@@ -1,12 +0,0 @@
-within Buildings.Experimental.DHC.Examples.Combined;
-package BaseClasses "Package with base classes that are used by multiple models"
-  extends Modelica.Icons.BasesPackage;
-
-annotation (Documentation(info="<html>
-<p>
-This package contains base classes that are used to construct the classes in
-<a href=\"modelica://Buildings.Experimental.DHC.Examples.Combined\">
-Buildings.Experimental.DHC.Examples.Combined</a>.
-</p>
-</html>"));
-end BaseClasses;
diff --git a/Buildings/Experimental/DHC/Loads/BaseClasses/Examples/BaseClasses/package.order b/Buildings/Experimental/DHC/Loads/BaseClasses/Examples/BaseClasses/package.order
deleted file mode 100644
index dc3c3b8b46e..00000000000
--- a/Buildings/Experimental/DHC/Loads/BaseClasses/Examples/BaseClasses/package.order
+++ /dev/null
@@ -1,9 +0,0 @@
-BuildingRCZ1Valve
-BuildingRCZ6
-BuildingSpawnZ1
-BuildingSpawnZ6
-BuildingTimeSeries
-FanCoil4Pipe
-FanCoil4PipeHeatPorts
-PartialFanCoil4Pipe
-GeojsonExportRC
diff --git a/Buildings/Experimental/DHC/Loads/Steam/BaseClasses/package.mo b/Buildings/Experimental/DHC/Loads/Steam/BaseClasses/package.mo
deleted file mode 100644
index 5cbe99eba4c..00000000000
--- a/Buildings/Experimental/DHC/Loads/Steam/BaseClasses/package.mo
+++ /dev/null
@@ -1,12 +0,0 @@
-within Buildings.Experimental.DHC.Loads.Steam;
-package BaseClasses "Package with base classes for Buildings.Experimental.DHC.Loads.Steam"
-  extends Modelica.Icons.BasesPackage;
-
-annotation (preferredView="info", Documentation(info="<html>
-<p>
-This package contains base classes that are used to construct the models in
-<a href=\"modelica://Buildings.Experimental.DHC.Loads.Steam\">
-Buildings.Experimental.DHC.Loads.Steam</a>.
-</p>
-</html>"));
-end BaseClasses;
diff --git a/Buildings/Experimental/DHC/Plants/Steam/BaseClasses/package.mo b/Buildings/Experimental/DHC/Plants/Steam/BaseClasses/package.mo
deleted file mode 100644
index 270123e9dc4..00000000000
--- a/Buildings/Experimental/DHC/Plants/Steam/BaseClasses/package.mo
+++ /dev/null
@@ -1,12 +0,0 @@
-within Buildings.Experimental.DHC.Plants.Steam;
-package BaseClasses "Package with base classes for Buildings.Experimental.DHC.Plants.Steam"
-  extends Modelica.Icons.BasesPackage;
-
-annotation (preferredView="info", Documentation(info="<html>
-<p>
-This package contains base classes that are used to construct the models in
-<a href=\"modelica://Buildings.Experimental.DHC.Plants.Steam\">
-Buildings.Experimental.DHC.Plants.Steam</a>.
-</p>
-</html>"));
-end BaseClasses;
diff --git a/Buildings/Experimental/package.mo b/Buildings/Experimental/package.mo
deleted file mode 100644
index 550d706a85b..00000000000
--- a/Buildings/Experimental/package.mo
+++ /dev/null
@@ -1,14 +0,0 @@
-within Buildings;
-package Experimental "Package with experimental models"
-  extends Modelica.Icons.Package;
-
-  annotation (preferredView="info", Documentation(info="<html>
-<p>
-This package contains models that are experimental.
-The models may change in non-backward compatible ways even
-between minor releases of the <code>Buildings</code> library.
-The models may be moved to other packages of the <code>Buildings</code> library
-if they have been shown to be useful and their development is stable.
-</p>
-</html>"));
-end Experimental;
diff --git a/Buildings/Experimental/package.order b/Buildings/Experimental/package.order
deleted file mode 100644
index f577981fbd0..00000000000
--- a/Buildings/Experimental/package.order
+++ /dev/null
@@ -1 +0,0 @@
-DHC
diff --git a/Buildings/Fluid/DXSystems/Cooling/AirSource/Data/Generic/BaseClasses/PerformanceCurve.mo b/Buildings/Fluid/DXSystems/Cooling/AirSource/Data/Generic/BaseClasses/PerformanceCurve.mo
index ebd928c6542..222089c5e59 100644
--- a/Buildings/Fluid/DXSystems/Cooling/AirSource/Data/Generic/BaseClasses/PerformanceCurve.mo
+++ b/Buildings/Fluid/DXSystems/Cooling/AirSource/Data/Generic/BaseClasses/PerformanceCurve.mo
@@ -6,7 +6,7 @@ record PerformanceCurve "Data record for a performance curve"
     "Biquadratic coefficients for cooling capacity function of temperature"
     annotation (Dialog(group="Performance curves"));
   parameter Real  capFunFF[:]
-    "Polynomial coefficients for cooling capacity function of flow fration"
+    "Polynomial coefficients for cooling capacity function of flow fraction"
     annotation (Dialog(group="Performance curves"));
   parameter Real  EIRFunT[6]
     "Biquadratic coefficients for EIR function of temperature"
diff --git a/Buildings/Fluid/DXSystems/Cooling/AirSource/Data/Generic/DXCoil.mo b/Buildings/Fluid/DXSystems/Cooling/AirSource/Data/Generic/DXCoil.mo
index 7185cef5c38..94c366d1bf5 100644
--- a/Buildings/Fluid/DXSystems/Cooling/AirSource/Data/Generic/DXCoil.mo
+++ b/Buildings/Fluid/DXSystems/Cooling/AirSource/Data/Generic/DXCoil.mo
@@ -113,13 +113,13 @@ Each element of the array <code>per</code> has the following data.
      EIRFunT  - Coefficients of biquadratic polynomial for EIR as a function of temperature.
      EIRFunFF - Polynomial coefficients for EIR
                 as a function of the mass flow fraction.
-     TConInRan - Minimum and maximum condenser air inlet temperatures
+     [TConInMin, TConInMax] - Minimum and maximum condenser air inlet temperatures
                  for which the performance curves are valid.
                  Outside this range, they will be linearly extrapolated.
-     TEvaInRan - Minimum and maximum evaporator air inlet temperatures
+     [TEvaInMin, TEvaInMax] - Minimum and maximum evaporator air inlet temperatures
                  for which the performance curves are valid.
                  Outside this range, they will be linearly extrapolated.
-     ffRan     - Minimum and maximum air mass flow fraction (relative to m_flow_nominal)
+     [ffMin, ffMax] - Minimum and maximum air mass flow fraction (relative to m_flow_nominal)
                  for which the performance curves are valid.
                  Outside this range, they will be linearly extrapolated.
 </pre>
@@ -157,6 +157,11 @@ a quadratic function.
 revisions="<html>
 <ul>
 <li>
+April 6, 2024, by Karthik Devaprasad:<br/>
+Replaced unused parameter names with correct parameter pairs for curve limit
+definitions in the documentation.
+</li>
+<li>
 April 4, 2023, by Xing Lu and Karthik Devaprasad:<br/>
 Updated record class name from <code>DXCoil</code> to <code>CoolingCoil</code>.
 </li>
diff --git a/Buildings/Fluid/DXSystems/Cooling/WaterSource/Data/Generic/BaseClasses/PerformanceCurve.mo b/Buildings/Fluid/DXSystems/Cooling/WaterSource/Data/Generic/BaseClasses/PerformanceCurve.mo
index 22c4596d55d..0e8bad136bb 100644
--- a/Buildings/Fluid/DXSystems/Cooling/WaterSource/Data/Generic/BaseClasses/PerformanceCurve.mo
+++ b/Buildings/Fluid/DXSystems/Cooling/WaterSource/Data/Generic/BaseClasses/PerformanceCurve.mo
@@ -9,7 +9,7 @@ record PerformanceCurve "Data record for a performance curve"
     annotation (Dialog(group="Performance curves"));
 
   parameter Real EIRFunFFCon[:]
-    "Polynomial coefficients for EIR function of water flow fration at condensers"
+    "Polynomial coefficients for EIR function of water flow fraction at condensers"
     annotation (Dialog(group="Performance curves"));
 //------------------------Range for performance curves------------------------//
 
diff --git a/Buildings/Fluid/DXSystems/Cooling/WaterSource/Data/Generic/DXCoil.mo b/Buildings/Fluid/DXSystems/Cooling/WaterSource/Data/Generic/DXCoil.mo
index 4f434c4be14..6f7280db19b 100644
--- a/Buildings/Fluid/DXSystems/Cooling/WaterSource/Data/Generic/DXCoil.mo
+++ b/Buildings/Fluid/DXSystems/Cooling/WaterSource/Data/Generic/DXCoil.mo
@@ -59,16 +59,17 @@ Each element of the array <code>per</code> has the following data.
                 as a function of the air mass flow fraction at evaporators.
      EIRFunFFCon - Polynomial coefficients for EIR
                 as a function of the water mass flow fraction at condensers.
-     TConInRan - Minimum and maximum condenser water inlet temperatures
+     [TConInMin, TConInMax] - Minimum and maximum condenser water inlet temperatures
                  for which the performance curves are valid.
                  Outside this range, they will be linearly extrapolated.
-     TEvaInRan - Minimum and maximum evaporator air inlet temperatures
+     [TEvaInMin, TEvaInMax] - Minimum and maximum evaporator air inlet temperatures
                  for which the performance curves are valid.
                  Outside this range, they will be linearly extrapolated.
-     ffRan     - Minimum and maximum air mass flow fraction at evaporators (relative to m_flow_nominal)
+     [ffMin, ffMax] - Minimum and maximum air mass flow fraction at evaporators (relative to m_flow_nominal)
                  for which the performance curves are valid.
                  Outside this range, they will be linearly extrapolated.
-     ffConRan     - Minimum and maximum water mass flow fraction at condensers (relative to m_flow_nominal)
+     [ffConMin, ffConMax] - Minimum and maximum water mass flow fraction at
+                 condensers (relative to m_flow_nominal)
                  for which the performance curves are valid.
                  Outside this range, they will be linearly extrapolated.
 
@@ -107,6 +108,11 @@ a quadratic function.
 revisions="<html>
 <ul>
 <li>
+April 6, 2024, by Karthik Devaprasad:<br/>
+Replaced unused parameter names with correct parameter pairs for curve limit
+definitions in the documentation.
+</li>
+<li>
 April 5, 2023, by Xing Lu:<br/>
 Updated class being extended from <code>DXCoil</code> to
 <a href=\"modelica://Buildings.Fluid.DXSystems.Cooling.AirSource.Data.Generic.DXCoil\">
diff --git a/Buildings/Fluid/DXSystems/Heating/AirSource/Data/Generic/DXCoil.mo b/Buildings/Fluid/DXSystems/Heating/AirSource/Data/Generic/DXCoil.mo
index 75855e59a05..8f2c33723ce 100644
--- a/Buildings/Fluid/DXSystems/Heating/AirSource/Data/Generic/DXCoil.mo
+++ b/Buildings/Fluid/DXSystems/Heating/AirSource/Data/Generic/DXCoil.mo
@@ -51,7 +51,7 @@ record DXCoil
     "Crankcase heater capacity";
 //-----------------------------Performance curves-----------------------------//
   parameter Real defEIRFunT[6] = fill(0,6)
-    "Biquadratic coefficients for defrost capacity function of temperature"
+    "Biquadratic coefficients for defrost capacity as a function of temperature"
     annotation (Dialog(enable = defOpe==Buildings.Fluid.DXSystems.Heating.BaseClasses.Types.DefrostOperation.reverseCycle));
 
   parameter Real PLFraFunPLR[:] = {1}
@@ -80,7 +80,7 @@ Each element of the array <code>per</code> has the following data.
 </p>
 <pre>
   spe    - Rotational speed for the respective stage.
-           (This is only used for variable speed coils to interpolate for 
+           (This is only used for variable speed coils to interpolate for
            intermediate speeds).
   nomVal - Nominal performance values for the respective stage. Data of the
            nomVal record are:<br/>
@@ -96,22 +96,22 @@ Each element of the array <code>per</code> has the following data.
     per            - Array of records with one performance curve for the respective
                      stage of the coil. That is, the performance curves will be used
                      in conjunction with the nominal values defined in the record <code>spe</code>:<br/>
-                     
+
       capFunT   - Coefficients of biquadratic polynomial for heating capacity
                   as a function of temperature.
-      capFunFF  - Polynomial coefficients for heating capacity as a function of 
+      capFunFF  - Polynomial coefficients for heating capacity as a function of
                   the mass flow fraction.
-      EIRFunT   - Coefficients of biquadratic polynomial for EIR as a function 
+      EIRFunT   - Coefficients of biquadratic polynomial for EIR as a function
                   of temperature.
       EIRFunFF  - Polynomial coefficients for EIR as a function of the mass flow
                   fraction.
-      TConInRan - Minimum and maximum condenser air inlet temperatures for which 
-                  the performance curves are valid.
+      [TConInMin, TConInMax] - Minimum and maximum condenser air inlet temperatures
+                  for which the performance curves are valid.
                   Outside this range, they will be linearly extrapolated.
-      TEvaInRan - Minimum and maximum evaporator air inlet temperatures for which 
-                  the performance curves are valid.
+      [TEvaInMin, TEvaInMax] - Minimum and maximum evaporator air inlet temperatures
+                  for which the performance curves are valid.
                   Outside this range, they will be linearly extrapolated.
-      ffRan     - Minimum and maximum air mass flow fraction (relative to m_flow_nominal)
+      [ffMin, ffMax] - Minimum and maximum air mass flow fraction (relative to m_flow_nominal)
                   for which the performance curves are valid.
                   Outside this range, they will be linearly extrapolated.
                   </pre>
@@ -124,16 +124,16 @@ quadratic function is used for stage one, then stage two must also use
 a quadratic function.
 </p>
 <p>
-It also contains settings and performance curves for defrost operation and overall 
+It also contains settings and performance curves for defrost operation and overall
 performance modifiers:
 </p>
 <pre>
-  defEIRFunT  - Coefficients of biquadratic polynomial for EIR for defrost as a 
+  defEIRFunT  - Coefficients of biquadratic polynomial for EIR for defrost as a
                 function of temperature.
   PLFraFunPLR - Coefficients of polynomial for part-load fraction as a function
                 of part-load ratio.
   defOpe      - Defrost operation type.
-  QDefResCap  - Capacity of heating element on outdoor coil (used for resistive defrost).  
+  QDefResCap  - Capacity of heating element on outdoor coil (used for resistive defrost).
   QCraCap     - Capacity of crankcase heater.
   defTri      - Defrost time fraction calculation method.
   tDefRun     - Fraction of time for which defrost is run if timed fraction calculation is used.
@@ -143,6 +143,11 @@ performance modifiers:
 revisions="<html>
 <ul>
 <li>
+April 6, 2024, by Karthik Devaprasad:<br/>
+Replaced unused parameter names with correct parameter pairs for curve limit
+definitions in the documentation.
+</li>
+<li>
 March 31, 2023 by Karthik Devaprasad and Xing Lu:<br/>
 First implementation.
 </li>
diff --git a/Buildings/Fluid/FixedResistances/BuriedPipes/PipeGroundCoupling.mo b/Buildings/Fluid/FixedResistances/BuriedPipes/PipeGroundCoupling.mo
index 1e7661380fa..4ee42ccda2e 100644
--- a/Buildings/Fluid/FixedResistances/BuriedPipes/PipeGroundCoupling.mo
+++ b/Buildings/Fluid/FixedResistances/BuriedPipes/PipeGroundCoupling.mo
@@ -13,7 +13,7 @@ model PipeGroundCoupling
   parameter Boolean steadyStateInitial = false
     "true initializes dT(0)/dt=0, false initializes T(0) at fixed temperature using TpipSta and TGrouBouSta" annotation (Dialog(group="Initialization", enable=not steadyStateInitial));
   parameter Modelica.Units.SI.Length dep = 10 "Depth of buried pipe to calculate ground temperature";
-  replaceable parameter Buildings.Experimental.DHC.Examples.Combined.BaseClasses.Zurich cliCon
+  replaceable parameter Buildings.DHC.Examples.Combined.BaseClasses.Zurich cliCon
     "Surface temperature climatic conditions";
   replaceable parameter Buildings.HeatTransfer.Data.Soil.Generic soiDat(
     k=1.58,c=1150,d=1600) "Soil thermal properties" annotation (Placement(transformation(extent={{-90,72},{-70,92}})));
diff --git a/Buildings/Resources/Data/Experimental/DHC/Loads/BaseClasses/Validation/RefBldgLargeOfficeNew2004_7.1_5.0_3C_USA_CA_SAN_FRANCISCO.mos b/Buildings/Resources/Data/DHC/Loads/BaseClasses/Validation/RefBldgLargeOfficeNew2004_7.1_5.0_3C_USA_CA_SAN_FRANCISCO.mos
similarity index 100%
rename from Buildings/Resources/Data/Experimental/DHC/Loads/BaseClasses/Validation/RefBldgLargeOfficeNew2004_7.1_5.0_3C_USA_CA_SAN_FRANCISCO.mos
rename to Buildings/Resources/Data/DHC/Loads/BaseClasses/Validation/RefBldgLargeOfficeNew2004_7.1_5.0_3C_USA_CA_SAN_FRANCISCO.mos
diff --git a/Buildings/Resources/Data/Experimental/DHC/Loads/Examples/.gitignore b/Buildings/Resources/Data/DHC/Loads/Examples/.gitignore
similarity index 100%
rename from Buildings/Resources/Data/Experimental/DHC/Loads/Examples/.gitignore
rename to Buildings/Resources/Data/DHC/Loads/Examples/.gitignore
diff --git a/Buildings/Resources/Data/Experimental/DHC/Loads/Examples/BaseClasses/GeojsonExportRC/OfficeBuilding/InternalGains_Floor.txt b/Buildings/Resources/Data/DHC/Loads/Examples/BaseClasses/GeojsonExportRC/OfficeBuilding/InternalGains_Floor.txt
similarity index 100%
rename from Buildings/Resources/Data/Experimental/DHC/Loads/Examples/BaseClasses/GeojsonExportRC/OfficeBuilding/InternalGains_Floor.txt
rename to Buildings/Resources/Data/DHC/Loads/Examples/BaseClasses/GeojsonExportRC/OfficeBuilding/InternalGains_Floor.txt
diff --git a/Buildings/Resources/Data/Experimental/DHC/Loads/Examples/BaseClasses/GeojsonExportRC/OfficeBuilding/InternalGains_ICT.txt b/Buildings/Resources/Data/DHC/Loads/Examples/BaseClasses/GeojsonExportRC/OfficeBuilding/InternalGains_ICT.txt
similarity index 100%
rename from Buildings/Resources/Data/Experimental/DHC/Loads/Examples/BaseClasses/GeojsonExportRC/OfficeBuilding/InternalGains_ICT.txt
rename to Buildings/Resources/Data/DHC/Loads/Examples/BaseClasses/GeojsonExportRC/OfficeBuilding/InternalGains_ICT.txt
diff --git a/Buildings/Resources/Data/Experimental/DHC/Loads/Examples/BaseClasses/GeojsonExportRC/OfficeBuilding/InternalGains_Meeting.txt b/Buildings/Resources/Data/DHC/Loads/Examples/BaseClasses/GeojsonExportRC/OfficeBuilding/InternalGains_Meeting.txt
similarity index 100%
rename from Buildings/Resources/Data/Experimental/DHC/Loads/Examples/BaseClasses/GeojsonExportRC/OfficeBuilding/InternalGains_Meeting.txt
rename to Buildings/Resources/Data/DHC/Loads/Examples/BaseClasses/GeojsonExportRC/OfficeBuilding/InternalGains_Meeting.txt
diff --git a/Buildings/Resources/Data/Experimental/DHC/Loads/Examples/BaseClasses/GeojsonExportRC/OfficeBuilding/InternalGains_Office.txt b/Buildings/Resources/Data/DHC/Loads/Examples/BaseClasses/GeojsonExportRC/OfficeBuilding/InternalGains_Office.txt
similarity index 100%
rename from Buildings/Resources/Data/Experimental/DHC/Loads/Examples/BaseClasses/GeojsonExportRC/OfficeBuilding/InternalGains_Office.txt
rename to Buildings/Resources/Data/DHC/Loads/Examples/BaseClasses/GeojsonExportRC/OfficeBuilding/InternalGains_Office.txt
diff --git a/Buildings/Resources/Data/Experimental/DHC/Loads/Examples/BaseClasses/GeojsonExportRC/OfficeBuilding/InternalGains_Restroom.txt b/Buildings/Resources/Data/DHC/Loads/Examples/BaseClasses/GeojsonExportRC/OfficeBuilding/InternalGains_Restroom.txt
similarity index 100%
rename from Buildings/Resources/Data/Experimental/DHC/Loads/Examples/BaseClasses/GeojsonExportRC/OfficeBuilding/InternalGains_Restroom.txt
rename to Buildings/Resources/Data/DHC/Loads/Examples/BaseClasses/GeojsonExportRC/OfficeBuilding/InternalGains_Restroom.txt
diff --git a/Buildings/Resources/Data/Experimental/DHC/Loads/Examples/BaseClasses/GeojsonExportRC/OfficeBuilding/InternalGains_Storage.txt b/Buildings/Resources/Data/DHC/Loads/Examples/BaseClasses/GeojsonExportRC/OfficeBuilding/InternalGains_Storage.txt
similarity index 100%
rename from Buildings/Resources/Data/Experimental/DHC/Loads/Examples/BaseClasses/GeojsonExportRC/OfficeBuilding/InternalGains_Storage.txt
rename to Buildings/Resources/Data/DHC/Loads/Examples/BaseClasses/GeojsonExportRC/OfficeBuilding/InternalGains_Storage.txt
diff --git a/Buildings/Resources/Data/Experimental/DHC/Loads/Examples/MediumOffice-90.1-2010-5A.mos b/Buildings/Resources/Data/DHC/Loads/Examples/MediumOffice-90.1-2010-5A.mos
similarity index 100%
rename from Buildings/Resources/Data/Experimental/DHC/Loads/Examples/MediumOffice-90.1-2010-5A.mos
rename to Buildings/Resources/Data/DHC/Loads/Examples/MediumOffice-90.1-2010-5A.mos
diff --git a/Buildings/Resources/Data/Experimental/DHC/Loads/Examples/SwissHospital_20190916.mos b/Buildings/Resources/Data/DHC/Loads/Examples/SwissHospital_20190916.mos
similarity index 100%
rename from Buildings/Resources/Data/Experimental/DHC/Loads/Examples/SwissHospital_20190916.mos
rename to Buildings/Resources/Data/DHC/Loads/Examples/SwissHospital_20190916.mos
diff --git a/Buildings/Resources/Data/Experimental/DHC/Loads/Examples/SwissOffice_20190916.mos b/Buildings/Resources/Data/DHC/Loads/Examples/SwissOffice_20190916.mos
similarity index 100%
rename from Buildings/Resources/Data/Experimental/DHC/Loads/Examples/SwissOffice_20190916.mos
rename to Buildings/Resources/Data/DHC/Loads/Examples/SwissOffice_20190916.mos
diff --git a/Buildings/Resources/Data/Experimental/DHC/Loads/Examples/SwissResidential_20190916.mos b/Buildings/Resources/Data/DHC/Loads/Examples/SwissResidential_20190916.mos
similarity index 100%
rename from Buildings/Resources/Data/Experimental/DHC/Loads/Examples/SwissResidential_20190916.mos
rename to Buildings/Resources/Data/DHC/Loads/Examples/SwissResidential_20190916.mos
diff --git a/Buildings/Resources/Data/Experimental/DHC/Loads/HotWater/DHW_ApartmentMidRise.mos b/Buildings/Resources/Data/DHC/Loads/HotWater/DHW_ApartmentMidRise.mos
similarity index 100%
rename from Buildings/Resources/Data/Experimental/DHC/Loads/HotWater/DHW_ApartmentMidRise.mos
rename to Buildings/Resources/Data/DHC/Loads/HotWater/DHW_ApartmentMidRise.mos
diff --git a/Buildings/Resources/Images/Experimental/DHC/UserGuide/DHC_Package_Concept.png b/Buildings/Resources/Images/DHC/DHC/UserGuide/DHC_Package_Concept.png
similarity index 100%
rename from Buildings/Resources/Images/Experimental/DHC/UserGuide/DHC_Package_Concept.png
rename to Buildings/Resources/Images/DHC/DHC/UserGuide/DHC_Package_Concept.png
diff --git a/Buildings/Resources/Images/Experimental/DHC/UserGuide/DHC_Package_Concept.svg b/Buildings/Resources/Images/DHC/DHC/UserGuide/DHC_Package_Concept.svg
similarity index 100%
rename from Buildings/Resources/Images/Experimental/DHC/UserGuide/DHC_Package_Concept.svg
rename to Buildings/Resources/Images/DHC/DHC/UserGuide/DHC_Package_Concept.svg
diff --git a/Buildings/Resources/Images/Experimental/DHC/EnergyTransferStations/Combined/BaseClasses/PartialParallel.png b/Buildings/Resources/Images/DHC/ETS/Combined/BaseClasses/PartialParallel.png
similarity index 100%
rename from Buildings/Resources/Images/Experimental/DHC/EnergyTransferStations/Combined/BaseClasses/PartialParallel.png
rename to Buildings/Resources/Images/DHC/ETS/Combined/BaseClasses/PartialParallel.png
diff --git a/Buildings/Resources/Images/Experimental/DHC/EnergyTransferStations/Combined/BaseClasses/PartialParallel.svg b/Buildings/Resources/Images/DHC/ETS/Combined/BaseClasses/PartialParallel.svg
similarity index 100%
rename from Buildings/Resources/Images/Experimental/DHC/EnergyTransferStations/Combined/BaseClasses/PartialParallel.svg
rename to Buildings/Resources/Images/DHC/ETS/Combined/BaseClasses/PartialParallel.svg
diff --git a/Buildings/Resources/Images/Experimental/DHC/EnergyTransferStations/Combined/ChillerBorefield.png b/Buildings/Resources/Images/DHC/ETS/Combined/ChillerBorefield.png
similarity index 100%
rename from Buildings/Resources/Images/Experimental/DHC/EnergyTransferStations/Combined/ChillerBorefield.png
rename to Buildings/Resources/Images/DHC/ETS/Combined/ChillerBorefield.png
diff --git a/Buildings/Resources/Images/Experimental/DHC/EnergyTransferStations/Combined/ChillerBorefield.svg b/Buildings/Resources/Images/DHC/ETS/Combined/ChillerBorefield.svg
similarity index 100%
rename from Buildings/Resources/Images/Experimental/DHC/EnergyTransferStations/Combined/ChillerBorefield.svg
rename to Buildings/Resources/Images/DHC/ETS/Combined/ChillerBorefield.svg
diff --git a/Buildings/Resources/Images/Experimental/DHC/EnergyTransferStations/Combined/Subsystems/HeatPumpDHWTank.png b/Buildings/Resources/Images/DHC/ETS/Combined/Subsystems/HeatPumpDHWTank.png
similarity index 100%
rename from Buildings/Resources/Images/Experimental/DHC/EnergyTransferStations/Combined/Subsystems/HeatPumpDHWTank.png
rename to Buildings/Resources/Images/DHC/ETS/Combined/Subsystems/HeatPumpDHWTank.png
diff --git a/Buildings/Resources/Images/Experimental/DHC/EnergyTransferStations/Combined/Subsystems/HeatPumpDHWTank.svg b/Buildings/Resources/Images/DHC/ETS/Combined/Subsystems/HeatPumpDHWTank.svg
similarity index 100%
rename from Buildings/Resources/Images/Experimental/DHC/EnergyTransferStations/Combined/Subsystems/HeatPumpDHWTank.svg
rename to Buildings/Resources/Images/DHC/ETS/Combined/Subsystems/HeatPumpDHWTank.svg
diff --git a/Buildings/Resources/Images/Experimental/DHC/EnergyTransferStations/Cooling/Direct.png b/Buildings/Resources/Images/DHC/ETS/Cooling/Direct.png
similarity index 100%
rename from Buildings/Resources/Images/Experimental/DHC/EnergyTransferStations/Cooling/Direct.png
rename to Buildings/Resources/Images/DHC/ETS/Cooling/Direct.png
diff --git a/Buildings/Resources/Images/Experimental/DHC/EnergyTransferStations/Cooling/Direct.svg b/Buildings/Resources/Images/DHC/ETS/Cooling/Direct.svg
similarity index 100%
rename from Buildings/Resources/Images/Experimental/DHC/EnergyTransferStations/Cooling/Direct.svg
rename to Buildings/Resources/Images/DHC/ETS/Cooling/Direct.svg
diff --git a/Buildings/Resources/Images/Experimental/DHC/EnergyTransferStations/Cooling/Indirect.png b/Buildings/Resources/Images/DHC/ETS/Cooling/Indirect.png
similarity index 100%
rename from Buildings/Resources/Images/Experimental/DHC/EnergyTransferStations/Cooling/Indirect.png
rename to Buildings/Resources/Images/DHC/ETS/Cooling/Indirect.png
diff --git a/Buildings/Resources/Images/Experimental/DHC/EnergyTransferStations/Cooling/Indirect.svg b/Buildings/Resources/Images/DHC/ETS/Cooling/Indirect.svg
similarity index 100%
rename from Buildings/Resources/Images/Experimental/DHC/EnergyTransferStations/Cooling/Indirect.svg
rename to Buildings/Resources/Images/DHC/ETS/Cooling/Indirect.svg
diff --git a/Buildings/Resources/Images/Experimental/DHC/Examples/Cooling/ElectricChillersDirectETS.png b/Buildings/Resources/Images/DHC/Examples/Cooling/ElectricChillersDirectETS.png
similarity index 100%
rename from Buildings/Resources/Images/Experimental/DHC/Examples/Cooling/ElectricChillersDirectETS.png
rename to Buildings/Resources/Images/DHC/Examples/Cooling/ElectricChillersDirectETS.png
diff --git a/Buildings/Resources/Images/Experimental/DHC/Examples/Cooling/ElectricChillersDirectETS.svg b/Buildings/Resources/Images/DHC/Examples/Cooling/ElectricChillersDirectETS.svg
similarity index 100%
rename from Buildings/Resources/Images/Experimental/DHC/Examples/Cooling/ElectricChillersDirectETS.svg
rename to Buildings/Resources/Images/DHC/Examples/Cooling/ElectricChillersDirectETS.svg
diff --git a/Buildings/Resources/Images/Experimental/DHC/Loads/HotWater/DirectHeatExchangerWithElectricHeat.png b/Buildings/Resources/Images/DHC/Loads/HotWater/DirectHeatExchangerWithElectricHeat.png
similarity index 100%
rename from Buildings/Resources/Images/Experimental/DHC/Loads/HotWater/DirectHeatExchangerWithElectricHeat.png
rename to Buildings/Resources/Images/DHC/Loads/HotWater/DirectHeatExchangerWithElectricHeat.png
diff --git a/Buildings/Resources/Images/Experimental/DHC/Loads/HotWater/Example_DirectHeatExchangerWithAuxHeat.png b/Buildings/Resources/Images/DHC/Loads/HotWater/Example_DirectHeatExchangerWithAuxHeat.png
similarity index 100%
rename from Buildings/Resources/Images/Experimental/DHC/Loads/HotWater/Example_DirectHeatExchangerWithAuxHeat.png
rename to Buildings/Resources/Images/DHC/Loads/HotWater/Example_DirectHeatExchangerWithAuxHeat.png
diff --git a/Buildings/Resources/Images/Experimental/DHC/Loads/HotWater/Example_HeatPumpWithTank.png b/Buildings/Resources/Images/DHC/Loads/HotWater/Example_HeatPumpWithTank.png
similarity index 100%
rename from Buildings/Resources/Images/Experimental/DHC/Loads/HotWater/Example_HeatPumpWithTank.png
rename to Buildings/Resources/Images/DHC/Loads/HotWater/Example_HeatPumpWithTank.png
diff --git a/Buildings/Resources/Images/Experimental/DHC/Loads/HotWater/StorageTankWithExternalHeatExchanger.png b/Buildings/Resources/Images/DHC/Loads/HotWater/StorageTankWithExternalHeatExchanger.png
similarity index 100%
rename from Buildings/Resources/Images/Experimental/DHC/Loads/HotWater/StorageTankWithExternalHeatExchanger.png
rename to Buildings/Resources/Images/DHC/Loads/HotWater/StorageTankWithExternalHeatExchanger.png
diff --git a/Buildings/Resources/Images/Experimental/DHC/Loads/HotWater/StorageTankWithExternalHeatExchanger.svg b/Buildings/Resources/Images/DHC/Loads/HotWater/StorageTankWithExternalHeatExchanger.svg
similarity index 100%
rename from Buildings/Resources/Images/Experimental/DHC/Loads/HotWater/StorageTankWithExternalHeatExchanger.svg
rename to Buildings/Resources/Images/DHC/Loads/HotWater/StorageTankWithExternalHeatExchanger.svg
diff --git a/Buildings/Resources/Images/Experimental/DHC/Loads/FlowDistribution1.png b/Buildings/Resources/Images/DHC/Loads/Loads/FlowDistribution1.png
similarity index 100%
rename from Buildings/Resources/Images/Experimental/DHC/Loads/FlowDistribution1.png
rename to Buildings/Resources/Images/DHC/Loads/Loads/FlowDistribution1.png
diff --git a/Buildings/Resources/Images/Experimental/DHC/Loads/FlowDistribution1.svg b/Buildings/Resources/Images/DHC/Loads/Loads/FlowDistribution1.svg
similarity index 100%
rename from Buildings/Resources/Images/Experimental/DHC/Loads/FlowDistribution1.svg
rename to Buildings/Resources/Images/DHC/Loads/Loads/FlowDistribution1.svg
diff --git a/Buildings/Resources/Images/Experimental/DHC/Loads/FlowDistribution2.png b/Buildings/Resources/Images/DHC/Loads/Loads/FlowDistribution2.png
similarity index 100%
rename from Buildings/Resources/Images/Experimental/DHC/Loads/FlowDistribution2.png
rename to Buildings/Resources/Images/DHC/Loads/Loads/FlowDistribution2.png
diff --git a/Buildings/Resources/Images/Experimental/DHC/Loads/FlowDistribution2.svg b/Buildings/Resources/Images/DHC/Loads/Loads/FlowDistribution2.svg
similarity index 100%
rename from Buildings/Resources/Images/Experimental/DHC/Loads/FlowDistribution2.svg
rename to Buildings/Resources/Images/DHC/Loads/Loads/FlowDistribution2.svg
diff --git a/Buildings/Resources/Images/Experimental/DHC/Loads/PartialBuilding.png b/Buildings/Resources/Images/DHC/Loads/Loads/PartialBuilding.png
similarity index 100%
rename from Buildings/Resources/Images/Experimental/DHC/Loads/PartialBuilding.png
rename to Buildings/Resources/Images/DHC/Loads/Loads/PartialBuilding.png
diff --git a/Buildings/Resources/Images/Experimental/DHC/Loads/PartialBuilding.svg b/Buildings/Resources/Images/DHC/Loads/Loads/PartialBuilding.svg
similarity index 100%
rename from Buildings/Resources/Images/Experimental/DHC/Loads/PartialBuilding.svg
rename to Buildings/Resources/Images/DHC/Loads/Loads/PartialBuilding.svg
diff --git a/Buildings/Resources/Images/Experimental/DHC/Loads/PartialBuildingWithPartialETS.png b/Buildings/Resources/Images/DHC/Loads/Loads/PartialBuildingWithPartialETS.png
similarity index 100%
rename from Buildings/Resources/Images/Experimental/DHC/Loads/PartialBuildingWithPartialETS.png
rename to Buildings/Resources/Images/DHC/Loads/Loads/PartialBuildingWithPartialETS.png
diff --git a/Buildings/Resources/Images/Experimental/DHC/Loads/PartialBuildingWithPartialETS.svg b/Buildings/Resources/Images/DHC/Loads/Loads/PartialBuildingWithPartialETS.svg
similarity index 100%
rename from Buildings/Resources/Images/Experimental/DHC/Loads/PartialBuildingWithPartialETS.svg
rename to Buildings/Resources/Images/DHC/Loads/Loads/PartialBuildingWithPartialETS.svg
diff --git a/Buildings/Resources/Images/Experimental/DHC/Loads/Steam/BuildingTimeSeriesAtETS.png b/Buildings/Resources/Images/DHC/Loads/Steam/BuildingTimeSeriesAtETS.png
similarity index 100%
rename from Buildings/Resources/Images/Experimental/DHC/Loads/Steam/BuildingTimeSeriesAtETS.png
rename to Buildings/Resources/Images/DHC/Loads/Steam/BuildingTimeSeriesAtETS.png
diff --git a/Buildings/Resources/Images/Experimental/DHC/Loads/Steam/BuildingTimeSeriesAtETS.svg b/Buildings/Resources/Images/DHC/Loads/Steam/BuildingTimeSeriesAtETS.svg
similarity index 100%
rename from Buildings/Resources/Images/Experimental/DHC/Loads/Steam/BuildingTimeSeriesAtETS.svg
rename to Buildings/Resources/Images/DHC/Loads/Steam/BuildingTimeSeriesAtETS.svg
diff --git a/Buildings/Resources/Images/Experimental/DHC/Networks/Controls/MainPump.png b/Buildings/Resources/Images/DHC/Networks/Controls/MainPump.png
similarity index 100%
rename from Buildings/Resources/Images/Experimental/DHC/Networks/Controls/MainPump.png
rename to Buildings/Resources/Images/DHC/Networks/Controls/MainPump.png
diff --git a/Buildings/Resources/Images/Experimental/DHC/Networks/Controls/MainPump.svg b/Buildings/Resources/Images/DHC/Networks/Controls/MainPump.svg
similarity index 100%
rename from Buildings/Resources/Images/Experimental/DHC/Networks/Controls/MainPump.svg
rename to Buildings/Resources/Images/DHC/Networks/Controls/MainPump.svg
diff --git a/Buildings/Resources/Images/Experimental/DHC/Plants/Combined/AllElectricCWStorage.png b/Buildings/Resources/Images/DHC/Plants/Combined/AllElectricCWStorage.png
similarity index 100%
rename from Buildings/Resources/Images/Experimental/DHC/Plants/Combined/AllElectricCWStorage.png
rename to Buildings/Resources/Images/DHC/Plants/Combined/AllElectricCWStorage.png
diff --git a/Buildings/Resources/Images/Experimental/DHC/Plants/Combined/AllElectricCWStorage.svg b/Buildings/Resources/Images/DHC/Plants/Combined/AllElectricCWStorage.svg
similarity index 100%
rename from Buildings/Resources/Images/Experimental/DHC/Plants/Combined/AllElectricCWStorage.svg
rename to Buildings/Resources/Images/DHC/Plants/Combined/AllElectricCWStorage.svg
diff --git a/Buildings/Resources/Images/Experimental/DHC/Plants/Cooling/Controls/ChillerStage.png b/Buildings/Resources/Images/DHC/Plants/Cooling/Controls/ChillerStage.png
similarity index 100%
rename from Buildings/Resources/Images/Experimental/DHC/Plants/Cooling/Controls/ChillerStage.png
rename to Buildings/Resources/Images/DHC/Plants/Cooling/Controls/ChillerStage.png
diff --git a/Buildings/Resources/Images/Experimental/DHC/Plants/Cooling/Controls/ChillerStage.svg b/Buildings/Resources/Images/DHC/Plants/Cooling/Controls/ChillerStage.svg
similarity index 100%
rename from Buildings/Resources/Images/Experimental/DHC/Plants/Cooling/Controls/ChillerStage.svg
rename to Buildings/Resources/Images/DHC/Plants/Cooling/Controls/ChillerStage.svg
diff --git a/Buildings/Resources/Images/Experimental/DHC/Plants/Cooling/ControlSignals.drawio b/Buildings/Resources/Images/DHC/Plants/Cooling/Cooling/ControlSignals.drawio
similarity index 100%
rename from Buildings/Resources/Images/Experimental/DHC/Plants/Cooling/ControlSignals.drawio
rename to Buildings/Resources/Images/DHC/Plants/Cooling/Cooling/ControlSignals.drawio
diff --git a/Buildings/Resources/Images/Experimental/DHC/Plants/Cooling/ControlSignals.png b/Buildings/Resources/Images/DHC/Plants/Cooling/Cooling/ControlSignals.png
similarity index 100%
rename from Buildings/Resources/Images/Experimental/DHC/Plants/Cooling/ControlSignals.png
rename to Buildings/Resources/Images/DHC/Plants/Cooling/Cooling/ControlSignals.png
diff --git a/Buildings/Resources/Images/Experimental/DHC/Plants/Cooling/ControlSignals.svg b/Buildings/Resources/Images/DHC/Plants/Cooling/Cooling/ControlSignals.svg
similarity index 100%
rename from Buildings/Resources/Images/Experimental/DHC/Plants/Cooling/ControlSignals.svg
rename to Buildings/Resources/Images/DHC/Plants/Cooling/Cooling/ControlSignals.svg
diff --git a/Buildings/Resources/Images/Experimental/DHC/Plants/Cooling/ElectricChillerParallel.png b/Buildings/Resources/Images/DHC/Plants/Cooling/Cooling/ElectricChillerParallel.png
similarity index 100%
rename from Buildings/Resources/Images/Experimental/DHC/Plants/Cooling/ElectricChillerParallel.png
rename to Buildings/Resources/Images/DHC/Plants/Cooling/Cooling/ElectricChillerParallel.png
diff --git a/Buildings/Resources/Images/Experimental/DHC/Plants/Cooling/ElectricChillerParallel.svg b/Buildings/Resources/Images/DHC/Plants/Cooling/Cooling/ElectricChillerParallel.svg
similarity index 100%
rename from Buildings/Resources/Images/Experimental/DHC/Plants/Cooling/ElectricChillerParallel.svg
rename to Buildings/Resources/Images/DHC/Plants/Cooling/Cooling/ElectricChillerParallel.svg
diff --git a/Buildings/Resources/Images/Experimental/DHC/Plants/Cooling/SystemConcept.drawio b/Buildings/Resources/Images/DHC/Plants/Cooling/Cooling/SystemConcept.drawio
similarity index 100%
rename from Buildings/Resources/Images/Experimental/DHC/Plants/Cooling/SystemConcept.drawio
rename to Buildings/Resources/Images/DHC/Plants/Cooling/Cooling/SystemConcept.drawio
diff --git a/Buildings/Resources/Images/Experimental/DHC/Plants/Cooling/SystemConcept.png b/Buildings/Resources/Images/DHC/Plants/Cooling/Cooling/SystemConcept.png
similarity index 100%
rename from Buildings/Resources/Images/Experimental/DHC/Plants/Cooling/SystemConcept.png
rename to Buildings/Resources/Images/DHC/Plants/Cooling/Cooling/SystemConcept.png
diff --git a/Buildings/Resources/Images/Experimental/DHC/Plants/Cooling/SystemConcept.svg b/Buildings/Resources/Images/DHC/Plants/Cooling/Cooling/SystemConcept.svg
similarity index 100%
rename from Buildings/Resources/Images/Experimental/DHC/Plants/Cooling/SystemConcept.svg
rename to Buildings/Resources/Images/DHC/Plants/Cooling/Cooling/SystemConcept.svg
diff --git a/Buildings/Resources/Images/Experimental/DHC/Plants/Steam/BaseClasses/BoilerPolynomial.png b/Buildings/Resources/Images/DHC/Plants/Steam/BaseClasses/BoilerPolynomial.png
similarity index 100%
rename from Buildings/Resources/Images/Experimental/DHC/Plants/Steam/BaseClasses/BoilerPolynomial.png
rename to Buildings/Resources/Images/DHC/Plants/Steam/BaseClasses/BoilerPolynomial.png
diff --git a/Buildings/Resources/Images/Experimental/DHC/Plants/Steam/BaseClasses/BoilerPolynomial.svg b/Buildings/Resources/Images/DHC/Plants/Steam/BaseClasses/BoilerPolynomial.svg
similarity index 100%
rename from Buildings/Resources/Images/Experimental/DHC/Plants/Steam/BaseClasses/BoilerPolynomial.svg
rename to Buildings/Resources/Images/DHC/Plants/Steam/BaseClasses/BoilerPolynomial.svg
diff --git a/Buildings/Resources/Images/Templates/Plants/HeatPumps/AirToWater.png b/Buildings/Resources/Images/Templates/Plants/HeatPumps/AirToWater.png
new file mode 100644
index 00000000000..e56207c6969
Binary files /dev/null and b/Buildings/Resources/Images/Templates/Plants/HeatPumps/AirToWater.png differ
diff --git a/Buildings/Resources/Images/Templates/Plants/HeatPumps/AirToWater.svg b/Buildings/Resources/Images/Templates/Plants/HeatPumps/AirToWater.svg
new file mode 100644
index 00000000000..da70a336999
--- /dev/null
+++ b/Buildings/Resources/Images/Templates/Plants/HeatPumps/AirToWater.svg
@@ -0,0 +1,916 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   width="215.25mm"
+   height="115.25mm"
+   viewBox="0 0 215.25 115.25"
+   version="1.1"
+   id="svg1"
+   inkscape:version="1.3.2 (091e20e, 2023-11-25, custom)"
+   sodipodi:docname="AirToWater.svg"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg">
+  <sodipodi:namedview
+     id="namedview1"
+     pagecolor="#ffffff"
+     bordercolor="#000000"
+     borderopacity="0.25"
+     inkscape:showpageshadow="2"
+     inkscape:pageopacity="0.0"
+     inkscape:pagecheckerboard="0"
+     inkscape:deskcolor="#d1d1d1"
+     inkscape:document-units="mm"
+     showgrid="true"
+     inkscape:zoom="1.4142136"
+     inkscape:cx="345.77521"
+     inkscape:cy="257.03331"
+     inkscape:window-width="2560"
+     inkscape:window-height="1369"
+     inkscape:window-x="-8"
+     inkscape:window-y="-8"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="layer1">
+    <inkscape:grid
+       id="grid6"
+       units="mm"
+       originx="-114.875"
+       originy="-79.874993"
+       spacingx="1"
+       spacingy="0.99999998"
+       empcolor="#0099e5"
+       empopacity="0.30196078"
+       color="#0099e5"
+       opacity="0.14901961"
+       empspacing="5"
+       dotted="false"
+       gridanglex="30"
+       gridanglez="30"
+       visible="true" />
+  </sodipodi:namedview>
+  <defs
+     id="defs1">
+    <marker
+       style="overflow:visible"
+       id="Stop-1-0-0"
+       refX="0"
+       refY="0"
+       orient="auto"
+       inkscape:stockid="Stop"
+       markerWidth="1"
+       markerHeight="1"
+       viewBox="0 0 1 1"
+       inkscape:isstock="true"
+       inkscape:collect="always"
+       preserveAspectRatio="xMidYMid">
+      <path
+         style="fill:none;stroke:context-stroke;stroke-width:1"
+         d="M 0,4 V -4"
+         id="path23-3-4-6" />
+    </marker>
+    <marker
+       style="overflow:visible"
+       id="Stop-1-0-0-8"
+       refX="0"
+       refY="0"
+       orient="auto"
+       inkscape:stockid="Stop"
+       markerWidth="1"
+       markerHeight="1"
+       viewBox="0 0 1 1"
+       inkscape:isstock="true"
+       inkscape:collect="always"
+       preserveAspectRatio="xMidYMid">
+      <path
+         style="fill:none;stroke:context-stroke;stroke-width:1"
+         d="M 0,4 V -4"
+         id="path23-3-4-6-7" />
+    </marker>
+    <marker
+       style="overflow:visible"
+       id="Stop-1-0-0-5"
+       refX="0"
+       refY="0"
+       orient="auto"
+       inkscape:stockid="Stop"
+       markerWidth="1"
+       markerHeight="1"
+       viewBox="0 0 1 1"
+       inkscape:isstock="true"
+       inkscape:collect="always"
+       preserveAspectRatio="xMidYMid">
+      <path
+         style="fill:none;stroke:context-stroke;stroke-width:1"
+         d="M 0,4 V -4"
+         id="path23-3-4-6-2" />
+    </marker>
+    <marker
+       style="overflow:visible"
+       id="Stop-1-0-0-8-3"
+       refX="0"
+       refY="0"
+       orient="auto"
+       inkscape:stockid="Stop"
+       markerWidth="1"
+       markerHeight="1"
+       viewBox="0 0 1 1"
+       inkscape:isstock="true"
+       inkscape:collect="always"
+       preserveAspectRatio="xMidYMid">
+      <path
+         style="fill:none;stroke:context-stroke;stroke-width:1"
+         d="M 0,4 V -4"
+         id="path23-3-4-6-7-8" />
+    </marker>
+  </defs>
+  <g
+     inkscape:label="Piping"
+     inkscape:groupmode="layer"
+     id="layer1"
+     style="display:inline"
+     transform="translate(-114.87501,-79.874992)">
+    <path
+       style="fill:none;fill-opacity:1;stroke:#000000;stroke-width:0.5;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+       d="m 120,120 h 35"
+       id="path2-83-1"
+       sodipodi:nodetypes="cc" />
+    <path
+       style="display:inline;fill:none;fill-opacity:1;stroke:#000000;stroke-width:0.5;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+       d="m 140,120 v 20"
+       id="path2-83-1-8"
+       sodipodi:nodetypes="cc" />
+    <path
+       style="fill:none;fill-opacity:1;stroke:#000000;stroke-width:0.5;stroke-dasharray:4, 2;stroke-dashoffset:0;stroke-opacity:1"
+       d="m 120,140 h 33 m 4,0 h 8"
+       id="path2-83-7-1"
+       sodipodi:nodetypes="cccc" />
+    <path
+       style="fill:none;fill-opacity:1;stroke:#000000;stroke-width:0.5;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker-start:url(#Stop-1-0-0);marker-end:url(#Stop-1-0-0)"
+       d="m 155,115 v 74.99999"
+       id="path2-4-3-0-2-3"
+       sodipodi:nodetypes="cc" />
+    <path
+       style="fill:none;fill-opacity:1;stroke:#000000;stroke-width:0.5;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker-start:url(#Stop-1-0-0-8);marker-end:url(#Stop-1-0-0-8)"
+       d="m 165,115 v 74.99999"
+       id="path2-4-3-0-2-3-5"
+       sodipodi:nodetypes="cc" />
+    <path
+       style="fill:none;fill-opacity:1;stroke:#000000;stroke-width:0.5;stroke-dasharray:none;stroke-opacity:1"
+       d="m 280.00001,140 h 8 m 4,0 h 33"
+       id="path2-83-7-1-6"
+       sodipodi:nodetypes="cccc" />
+    <path
+       style="fill:none;fill-opacity:1;stroke:#000000;stroke-width:0.5;stroke-dasharray:4, 2;stroke-dashoffset:0;stroke-opacity:1"
+       d="m 290.00001,120 h 35"
+       id="path2-83-7-1-6-9"
+       sodipodi:nodetypes="cc" />
+    <path
+       style="fill:none;fill-opacity:1;stroke:#000000;stroke-width:0.5;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker-start:url(#Stop-1-0-0-5);marker-end:url(#Stop-1-0-0-5)"
+       d="m 280.00001,115.00002 v 74.99999"
+       id="path2-4-3-0-2-3-7"
+       sodipodi:nodetypes="cc" />
+    <path
+       style="fill:none;fill-opacity:1;stroke:#000000;stroke-width:0.5;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker-start:url(#Stop-1-0-0-8-3);marker-end:url(#Stop-1-0-0-8-3)"
+       d="m 290.00001,115.00002 v 74.99999"
+       id="path2-4-3-0-2-3-5-1"
+       sodipodi:nodetypes="cc" />
+    <path
+       style="fill:none;fill-opacity:1;stroke:#000000;stroke-width:0.5;stroke-dasharray:4, 2;stroke-dashoffset:0;stroke-opacity:1"
+       d="m 210,155 -1e-5,-50.00001"
+       id="path2-83-74-0"
+       sodipodi:nodetypes="cc" />
+    <path
+       style="fill:none;fill-opacity:1;stroke:#000000;stroke-width:0.5;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+       d="m 195,165 -1e-5,-60.00001"
+       id="path2-83-74-0-3"
+       sodipodi:nodetypes="cc" />
+    <g
+       id="g2-9-4"
+       transform="matrix(0,1,1,0,200,-49.999988)"
+       style="stroke-width:0.25;stroke-dasharray:none">
+      <g
+         id="g3"
+         style="stroke-width:0.25;stroke-dasharray:none">
+        <ellipse
+           style="fill:#fefdfd;fill-opacity:1;stroke:#4d4d4d;stroke-width:0.25;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+           id="path10-1-39-91-0"
+           cx="169.99998"
+           cy="-5"
+           rx="4.6807604"
+           ry="4.6807609" />
+        <path
+           style="fill:#4d4d4d;fill-opacity:1;stroke:#4d4d4d;stroke-width:0.271144;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+           d="m 174.3727,-5.0000002 -4.20376,-4.4640421 v 8.92808458 z"
+           id="path11-4-05-72-0"
+           sodipodi:nodetypes="cccc" />
+      </g>
+    </g>
+    <path
+       style="fill:none;fill-opacity:1;stroke:#000000;stroke-width:0.5;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+       d="m 235.00001,185.00001 -1e-5,-80"
+       id="path2-83-74-0-3-4"
+       sodipodi:nodetypes="cc" />
+    <path
+       style="fill:none;fill-opacity:1;stroke:#000000;stroke-width:0.5;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+       d="m 280.00001,165 h -28 m -4,0 h -11 m -4,0 -66,1e-5 m -4,0 L 155,165"
+       id="path2-83-74-0-3-5"
+       sodipodi:nodetypes="cccccccc" />
+    <path
+       style="fill:none;fill-opacity:1;stroke:#000000;stroke-width:0.5;stroke-dasharray:4, 2;stroke-dashoffset:0;stroke-opacity:1"
+       d="m 290.00001,175 h -8 m -4,0 h -41 m -4,0 H 165"
+       id="path2-83-74-0-3-5-3"
+       sodipodi:nodetypes="cccccc" />
+    <path
+       style="fill:none;fill-opacity:1;stroke:#000000;stroke-width:0.5;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+       d="m 280.00001,184.99999 -113,1e-5 m -4,0 -8.00001,-1e-5"
+       id="path2-83-74-0-3-5-38"
+       sodipodi:nodetypes="cccc" />
+    <path
+       style="fill:none;fill-opacity:1;stroke:#000000;stroke-width:0.5;stroke-dasharray:4, 2;stroke-dashoffset:0;stroke-opacity:1"
+       d="m 250.00001,175.00002 v -70"
+       id="path2-83-74-0-35"
+       sodipodi:nodetypes="cc" />
+    <path
+       style="fill:none;fill-opacity:1;stroke:#000000;stroke-width:0.5;stroke-dasharray:4, 2;stroke-dashoffset:0;stroke-opacity:1"
+       d="m 290.00001,155 h -8 m -4,0 h -26 m -4,0 h -11 m -4,0 H 197 m -4,0 h -28"
+       id="path2-83-74-0-3-5-3-1"
+       sodipodi:nodetypes="cccccccccc" />
+    <text
+       xml:space="preserve"
+       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:5.64444px;line-height:0;font-family:'Arial Narrow';-inkscape-font-specification:'Arial Narrow, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-east-asian:normal;fill:#000000;stroke-width:0.999999"
+       x="154.94212"
+       y="112.01882"
+       id="text5-1-9-3-0-2-0-65-8-9-8-1"><tspan
+         sodipodi:role="line"
+         x="154.94212"
+         y="112.01882"
+         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:5.64444px;line-height:1.25;font-family:'Arial Narrow';-inkscape-font-specification:'Arial Narrow, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-east-asian:normal;text-align:center;text-anchor:middle;stroke-width:0.999999"
+         id="tspan2-4-4-04-2-5-0-5">HWS</tspan></text>
+    <text
+       xml:space="preserve"
+       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:5.64444px;line-height:0;font-family:'Arial Narrow';-inkscape-font-specification:'Arial Narrow, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-east-asian:normal;fill:#000000;stroke-width:0.999999"
+       x="169.85393"
+       y="112.0202"
+       id="text5-1-9-3-0-2-0-65-8-9-8-4"><tspan
+         sodipodi:role="line"
+         x="169.85393"
+         y="112.0202"
+         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:5.64444px;line-height:1.25;font-family:'Arial Narrow';-inkscape-font-specification:'Arial Narrow, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-east-asian:normal;text-align:center;text-anchor:middle;stroke-width:0.999999"
+         id="tspan2-4-4-04-2-5-0-4">HWR</tspan></text>
+    <text
+       xml:space="preserve"
+       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:5.64444px;line-height:0;font-family:'Arial Narrow';-inkscape-font-specification:'Arial Narrow, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-east-asian:normal;fill:#000000;stroke-width:0.999999"
+       x="275.00964"
+       y="112.01882"
+       id="text5-1-9-3-0-2-0-65-8-9-8-1-6"><tspan
+         sodipodi:role="line"
+         x="275.00964"
+         y="112.01882"
+         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:5.64444px;line-height:1.25;font-family:'Arial Narrow';-inkscape-font-specification:'Arial Narrow, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-east-asian:normal;text-align:center;text-anchor:middle;stroke-width:0.999999"
+         id="tspan2-4-4-04-2-5-0-5-2">CHWS</tspan></text>
+    <text
+       xml:space="preserve"
+       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:5.64444px;line-height:0;font-family:'Arial Narrow';-inkscape-font-specification:'Arial Narrow, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-east-asian:normal;fill:#000000;stroke-width:0.999999"
+       x="294.92145"
+       y="112.02022"
+       id="text5-1-9-3-0-2-0-65-8-9-8-4-5"><tspan
+         sodipodi:role="line"
+         x="294.92145"
+         y="112.02022"
+         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:5.64444px;line-height:1.25;font-family:'Arial Narrow';-inkscape-font-specification:'Arial Narrow, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-east-asian:normal;text-align:center;text-anchor:middle;stroke-width:0.999999"
+         id="tspan2-4-4-04-2-5-0-4-8">CHWR</tspan></text>
+    <g
+       inkscape:groupmode="layer"
+       id="layer3"
+       inkscape:label="svg_export">
+      <g
+         id="path2-4-3-0-2-3-57">
+        <path
+           style="color:#000000;fill:#000000;-inkscape-stroke:none"
+           d="m 154.75,115 v 75 h 0.5 v -75 z"
+           id="path7" />
+        <g
+           id="g2">
+          <path
+             style="color:#000000;fill:#000000;-inkscape-stroke:none"
+             d="m 153,189.75 v 0.5 h 4 v -0.5 z"
+             id="path6" />
+          <path
+             style="color:#000000;fill:#000000;-inkscape-stroke:none"
+             d="m 153,114.75 v 0.5 h 4 v -0.5 z"
+             id="path4" />
+        </g>
+      </g>
+      <g
+         id="path2-4-3-0-2-3-5-9">
+        <path
+           style="color:#000000;fill:#000000;-inkscape-stroke:none"
+           d="m 164.75,115 v 75 h 0.5 v -75 z"
+           id="path14" />
+        <g
+           id="g8">
+          <path
+             style="color:#000000;fill:#000000;-inkscape-stroke:none"
+             d="m 163,189.75 v 0.5 h 4 v -0.5 z"
+             id="path13" />
+          <path
+             style="color:#000000;fill:#000000;-inkscape-stroke:none"
+             d="m 163,114.75 v 0.5 h 4 v -0.5 z"
+             id="path12" />
+        </g>
+      </g>
+      <g
+         id="path2-4-3-0-2-3-7-8">
+        <path
+           style="color:#000000;fill:#000000;-inkscape-stroke:none"
+           d="m 279.75,115 v 75 h 0.5 v -75 z"
+           id="path28" />
+        <g
+           id="g18">
+          <path
+             style="color:#000000;fill:#000000;-inkscape-stroke:none"
+             d="m 278,189.75 v 0.5 h 4 v -0.5 z"
+             id="path27" />
+          <path
+             style="color:#000000;fill:#000000;-inkscape-stroke:none"
+             d="m 278,114.75 v 0.5 h 4 v -0.5 z"
+             id="path26" />
+        </g>
+      </g>
+      <g
+         id="path2-4-3-0-2-3-5-1-7">
+        <path
+           style="color:#000000;fill:#000000;-inkscape-stroke:none"
+           d="m 289.75,115 v 75 h 0.5 v -75 z"
+           id="path31" />
+        <g
+           id="g29">
+          <path
+             style="color:#000000;fill:#000000;-inkscape-stroke:none"
+             d="m 288,189.75 v 0.5 h 4 v -0.5 z"
+             id="path30" />
+          <path
+             style="color:#000000;fill:#000000;-inkscape-stroke:none"
+             d="m 288,114.75 v 0.5 h 4 v -0.5 z"
+             id="path29" />
+        </g>
+      </g>
+    </g>
+    <text
+       xml:space="preserve"
+       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:3.36661px;line-height:0;font-family:'Arial Narrow';-inkscape-font-specification:'Arial Narrow, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-east-asian:normal;display:inline;fill:#000000;stroke-width:0.596446"
+       x="242.5641"
+       y="91.924835"
+       id="text5-1-9-3-0-2-2-9-5"><tspan
+         sodipodi:role="line"
+         x="242.5641"
+         y="91.924835"
+         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:3.36661px;line-height:1.25;font-family:'Arial Narrow';-inkscape-font-specification:'Arial Narrow, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-east-asian:normal;text-align:center;text-anchor:middle;stroke-width:0.596446"
+         id="tspan2-4-1-2-4">AWHP-2</tspan></text>
+    <g
+       id="g1"
+       transform="matrix(0,-1.4214802,1.4214802,0,154.55682,448.47328)">
+      <ellipse
+         cy="249.4752"
+         cx="67.043098"
+         id="circle5669-8-4-7-9"
+         style="display:inline;fill:none;fill-opacity:0;stroke:#4d4d4d;stroke-width:0.132292;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         transform="matrix(0,1,1,0,0,0)"
+         rx="1.7583774"
+         ry="1.7565393" />
+      <path
+         id="path427"
+         d="m 247.87271,66.352258 2.50934,-0.832062"
+         style="display:inline;fill:none;stroke:#4d4d4d;stroke-width:0.132292;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+      <path
+         id="path429"
+         d="m 247.82879,67.746427 2.58463,0.80383"
+         style="display:inline;fill:none;stroke:#4d4d4d;stroke-width:0.132292;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+      <rect
+         y="-256.56128"
+         x="58.351643"
+         height="3.5130787"
+         width="7.0335097"
+         id="rect1469-2-9"
+         style="display:inline;fill:none;fill-opacity:1;stroke:#4d4d4d;stroke-width:0.132292;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         transform="rotate(90)" />
+      <path
+         id="path1471-4-1"
+         d="m 253.04822,58.351681 3.51308,7.033472"
+         style="display:inline;fill:none;stroke:#4d4d4d;stroke-width:0.132292;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+      <path
+         id="path459"
+         d="m 256.56126,58.351681 -3.51308,7.033472"
+         style="display:inline;fill:none;stroke:#4d4d4d;stroke-width:0.132292;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+      <path
+         id="path481"
+         d="m 251.29169,67.143547 h 1.75654 V 65.3851"
+         style="display:inline;fill:none;stroke:#4d4d4d;stroke-width:0.132292;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+      <path
+         id="path483"
+         d="m 253.04823,58.351681 v -1.758394 h -1.75654"
+         style="display:inline;fill:none;stroke:#4d4d4d;stroke-width:0.132292;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+      <path
+         id="path5655-7-5-9-1-5"
+         d="m 251.24604,55.715558 v 1.755431 l -1.7109,-0.877702 z"
+         style="display:inline;fill:none;fill-opacity:1;stroke:#4d4d4d;stroke-width:0.132292;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+      <path
+         id="path5657-8-5-7-6-3"
+         d="m 247.82425,55.715558 v 1.755431 l 1.71089,-0.877702 z"
+         style="display:inline;fill:none;fill-opacity:0;stroke:#4d4d4d;stroke-width:0.132292;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+      <rect
+         style="display:inline;fill:none;fill-opacity:1;stroke:#4d4d4d;stroke-width:0.132292;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         id="rect1469-2-9-7"
+         width="7.0335097"
+         height="3.5130787"
+         x="58.351643"
+         y="-246.02203"
+         transform="rotate(90)" />
+      <path
+         style="display:inline;fill:none;stroke:#4d4d4d;stroke-width:0.132292;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         d="m 242.50899,58.351681 3.51307,7.033472"
+         id="path1471-4-1-5" />
+      <path
+         style="display:inline;fill:none;stroke:#4d4d4d;stroke-width:0.132292;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         d="m 246.02203,58.351681 -3.51308,7.033472"
+         id="path459-5" />
+      <path
+         id="path3481"
+         d="m 246.02207,58.351681 v -1.758394 h 1.75654"
+         style="display:inline;fill:none;stroke:#4d4d4d;stroke-width:0.132292;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+      <path
+         id="path3538"
+         d="m 246.02207,65.385153 v 1.758368 h 1.69947"
+         style="display:inline;fill:none;stroke:#4d4d4d;stroke-width:0.132292;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+      <path
+         id="path3662"
+         d="m 241.63072,54.834892 h 15.80885 v 14.946207 h -15.80885 z"
+         style="display:inline;fill:none;stroke:#4d4d4d;stroke-width:0.132292;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+      <path
+         id="path3728"
+         d="m 241.63072,56.593287 h 0.87827 v 1.758394"
+         style="display:inline;fill:none;stroke:#4d4d4d;stroke-width:0.132292;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+      <path
+         id="path3730"
+         d="m 256.5613,58.351681 v -1.758394 h 0.87827"
+         style="display:inline;fill:none;stroke:#4d4d4d;stroke-width:0.132292;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+      <path
+         id="path3732"
+         d="m 256.5613,65.385153 v 1.758368 h 0.87827"
+         style="display:inline;fill:none;stroke:#4d4d4d;stroke-width:0.132292;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+      <path
+         id="path3734"
+         d="m 241.63072,67.143547 h 0.87827 V 65.3851"
+         style="display:inline;fill:none;stroke:#4d4d4d;stroke-width:0.132292;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+    </g>
+    <g
+       id="g3-9"
+       style="display:inline"
+       transform="matrix(1.0012268,0,0,1.0012268,-40.285234,-2.4919381)">
+      <text
+         xml:space="preserve"
+         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:3.36661px;line-height:0;font-family:'Arial Narrow';-inkscape-font-specification:'Arial Narrow, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-east-asian:normal;display:inline;fill:#000000;stroke-width:0.596446"
+         x="242.5641"
+         y="94.285057"
+         id="text5-1-9-3-0-2-2-9-5-0"><tspan
+           sodipodi:role="line"
+           x="242.5641"
+           y="94.285057"
+           style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:3.36661px;line-height:1.25;font-family:'Arial Narrow';-inkscape-font-specification:'Arial Narrow, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-east-asian:normal;text-align:center;text-anchor:middle;stroke-width:0.596446"
+           id="tspan2-4-1-2-4-5">AWHP-1</tspan></text>
+      <g
+         id="g2-0"
+         transform="matrix(0,-1.4197388,1.4197388,0,154.65231,450.41273)">
+        <ellipse
+           cy="249.4752"
+           cx="67.043098"
+           id="circle5669-8-4-7-9-9"
+           style="display:inline;fill:none;fill-opacity:0;stroke:#4d4d4d;stroke-width:0.132292;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+           transform="matrix(0,1,1,0,0,0)"
+           rx="1.7583774"
+           ry="1.7565393" />
+        <path
+           id="path427-7"
+           d="m 247.87271,66.352258 2.50934,-0.832062"
+           style="display:inline;fill:none;stroke:#4d4d4d;stroke-width:0.132292;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+        <path
+           id="path429-1"
+           d="m 247.82879,67.746427 2.58463,0.80383"
+           style="display:inline;fill:none;stroke:#4d4d4d;stroke-width:0.132292;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+        <rect
+           y="-256.56128"
+           x="58.351643"
+           height="3.5130787"
+           width="7.0335097"
+           id="rect1469-2-9-5"
+           style="display:inline;fill:none;fill-opacity:1;stroke:#4d4d4d;stroke-width:0.132292;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+           transform="rotate(90)" />
+        <path
+           id="path1471-4-1-6"
+           d="m 253.04822,58.351681 3.51308,7.033472"
+           style="display:inline;fill:none;stroke:#4d4d4d;stroke-width:0.132292;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+        <path
+           id="path459-7"
+           d="m 256.56126,58.351681 -3.51308,7.033472"
+           style="display:inline;fill:none;stroke:#4d4d4d;stroke-width:0.132292;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+        <path
+           id="path481-4"
+           d="m 251.29169,67.143547 h 1.75654 V 65.3851"
+           style="display:inline;fill:none;stroke:#4d4d4d;stroke-width:0.132292;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+        <path
+           id="path483-6"
+           d="m 253.04823,58.351681 v -1.758394 h -1.75654"
+           style="display:inline;fill:none;stroke:#4d4d4d;stroke-width:0.132292;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+        <path
+           id="path5655-7-5-9-1-5-6"
+           d="m 251.24604,55.715558 v 1.755431 l -1.7109,-0.877702 z"
+           style="display:inline;fill:none;fill-opacity:1;stroke:#4d4d4d;stroke-width:0.132292;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+        <path
+           id="path5657-8-5-7-6-3-4"
+           d="m 247.82425,55.715558 v 1.755431 l 1.71089,-0.877702 z"
+           style="display:inline;fill:none;fill-opacity:0;stroke:#4d4d4d;stroke-width:0.132292;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+        <rect
+           style="display:inline;fill:none;fill-opacity:1;stroke:#4d4d4d;stroke-width:0.132292;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+           id="rect1469-2-9-7-9"
+           width="7.0335097"
+           height="3.5130787"
+           x="58.351643"
+           y="-246.02203"
+           transform="rotate(90)" />
+        <path
+           style="display:inline;fill:none;stroke:#4d4d4d;stroke-width:0.132292;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+           d="m 242.50899,58.351681 3.51307,7.033472"
+           id="path1471-4-1-5-4" />
+        <path
+           style="display:inline;fill:none;stroke:#4d4d4d;stroke-width:0.132292;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+           d="m 246.02203,58.351681 -3.51308,7.033472"
+           id="path459-5-4" />
+        <path
+           id="path3481-8"
+           d="m 246.02207,58.351681 v -1.758394 h 1.75654"
+           style="display:inline;fill:none;stroke:#4d4d4d;stroke-width:0.132292;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+        <path
+           id="path3538-5"
+           d="m 246.02207,65.385153 v 1.758368 h 1.69947"
+           style="display:inline;fill:none;stroke:#4d4d4d;stroke-width:0.132292;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+        <path
+           id="path3662-3"
+           d="m 241.63072,54.834892 h 15.80885 v 14.946207 h -15.80885 z"
+           style="display:inline;fill:none;stroke:#4d4d4d;stroke-width:0.132292;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+        <path
+           id="path3728-5"
+           d="m 241.63072,56.593287 h 0.87827 v 1.758394"
+           style="display:inline;fill:none;stroke:#4d4d4d;stroke-width:0.132292;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+        <path
+           id="path3730-9"
+           d="m 256.5613,58.351681 v -1.758394 h 0.87827"
+           style="display:inline;fill:none;stroke:#4d4d4d;stroke-width:0.132292;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+        <path
+           id="path3732-2"
+           d="m 256.5613,65.385153 v 1.758368 h 0.87827"
+           style="display:inline;fill:none;stroke:#4d4d4d;stroke-width:0.132292;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+        <path
+           id="path3734-8"
+           d="m 241.63072,67.143547 h 0.87827 V 65.3851"
+           style="display:inline;fill:none;stroke:#4d4d4d;stroke-width:0.132292;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+      </g>
+    </g>
+    <path
+       style="display:inline;fill:none;fill-opacity:1;stroke:#000000;stroke-width:0.5;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+       d="m 305.00001,120 v 20"
+       id="path2-83-1-8-7"
+       sodipodi:nodetypes="cc" />
+    <g
+       id="g4-8"
+       style="display:inline;stroke-width:0.25;stroke-dasharray:none"
+       transform="translate(5.0000041,67.999998)">
+      <path
+         id="path25187-0-9-6-7-8-6-9-2-2-5-68-9-5-7-6-3-5-8-6-8-0-1-5-0-8-4-8-3-5-7-4-7-6"
+         style="fill:#ffffff;stroke:#4d4d4d;stroke-width:0.25;stroke-dasharray:none;stroke-opacity:1"
+         inkscape:transform-center-x="-0.80986268"
+         inkscape:transform-center-y="4.7081598e-05"
+         d="m 175,86.999998 5,2.999999 v -5.999999 z"
+         sodipodi:nodetypes="cccc" />
+      <path
+         id="path25187-0-9-6-7-8-6-9-2-2-5-68-9-5-7-6-3-5-8-6-8-0-1-5-0-8-4-8-3-5-2-5-5-6-8"
+         style="fill:#ffffff;stroke:#4d4d4d;stroke-width:0.25;stroke-dasharray:none;stroke-opacity:1"
+         inkscape:transform-center-x="0.80986732"
+         inkscape:transform-center-y="4.7081598e-05"
+         d="m 175,86.999998 -5,2.999999 v -5.999999 z"
+         sodipodi:nodetypes="cccc" />
+    </g>
+    <path
+       id="path5661-2-42-7-3-5-1-1-7"
+       d="M 180,151.67934 V 155"
+       style="display:inline;fill:none;stroke:#4d4d4d;stroke-width:0.25;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       sodipodi:nodetypes="cc" />
+    <ellipse
+       style="display:inline;fill:#fefdfd;fill-opacity:1;stroke:#4d4d4d;stroke-width:0.25;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+       id="path10-1-39-91-0-5"
+       cx="120"
+       cy="235"
+       rx="4.6807604"
+       ry="4.6807609"
+       transform="matrix(0,1,1,0,0,0)" />
+    <path
+       style="display:inline;fill:#4d4d4d;fill-opacity:1;stroke:#4d4d4d;stroke-width:0.271144;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+       d="m 235.00002,124.3727 -4.46404,-4.20376 h 8.92808 z"
+       id="path11-4-05-72-0-7"
+       sodipodi:nodetypes="cccc" />
+    <g
+       id="g5"
+       transform="translate(-0.0333985,-2.8057666)">
+      <ellipse
+         style="display:inline;fill:#fefdfd;fill-opacity:1;stroke:#4d4d4d;stroke-width:0.25;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+         id="path10-1-39-91-0-7"
+         cx="-130.0334"
+         cy="122.80576"
+         rx="4.6807604"
+         ry="4.6807609"
+         transform="scale(-1,1)" />
+      <path
+         style="display:inline;fill:#4d4d4d;fill-opacity:1;stroke:#4d4d4d;stroke-width:0.271144;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+         d="m 125.66067,122.80576 4.20376,-4.46404 v 8.92808 z"
+         id="path11-4-05-72-0-3"
+         sodipodi:nodetypes="cccc" />
+    </g>
+    <g
+       id="g6"
+       transform="translate(0.10257683,5.0192374)">
+      <ellipse
+         style="display:inline;fill:#fefdfd;fill-opacity:1;stroke:#4d4d4d;stroke-width:0.25;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+         id="path10-1-39-91-0-1"
+         cx="314.89743"
+         cy="-134.98076"
+         rx="4.6807604"
+         ry="4.6807609"
+         transform="scale(1,-1)" />
+      <path
+         style="display:inline;fill:#4d4d4d;fill-opacity:1;stroke:#4d4d4d;stroke-width:0.271144;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+         d="m 319.27014,134.98076 -4.20376,4.46404 v -8.92808 z"
+         id="path11-4-05-72-0-4"
+         sodipodi:nodetypes="cccc" />
+    </g>
+    <rect
+       y="178"
+       x="147.6844"
+       height="4.0000005"
+       width="3.9949403"
+       id="rect5659-1-1-1-8-2-2-99-3-0"
+       style="display:inline;fill:#ffffff;fill-opacity:1;stroke:#4d4d4d;stroke-width:0.199747;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+       transform="matrix(0,1,1,0,0,0)" />
+    <g
+       id="g9"
+       transform="translate(0.44102414,-2.0000047)">
+      <g
+         id="g4-8-1"
+         style="display:inline;stroke-width:0.25;stroke-dasharray:none"
+         transform="translate(4.5589824,79.999998)">
+        <path
+           id="path25187-0-9-6-7-8-6-9-2-2-5-68-9-5-7-6-3-5-8-6-8-0-1-5-0-8-4-8-3-5-7-4-7-6-9"
+           style="fill:#ffffff;stroke:#4d4d4d;stroke-width:0.25;stroke-dasharray:none;stroke-opacity:1"
+           inkscape:transform-center-x="-0.80986268"
+           inkscape:transform-center-y="4.7081598e-05"
+           d="m 175,86.999998 5,2.999999 v -5.999999 z"
+           sodipodi:nodetypes="cccc" />
+        <path
+           id="path25187-0-9-6-7-8-6-9-2-2-5-68-9-5-7-6-3-5-8-6-8-0-1-5-0-8-4-8-3-5-2-5-5-6-8-9"
+           style="fill:#ffffff;stroke:#4d4d4d;stroke-width:0.25;stroke-dasharray:none;stroke-opacity:1"
+           inkscape:transform-center-x="0.80986732"
+           inkscape:transform-center-y="4.7081598e-05"
+           d="m 175,86.999998 -5,2.999999 v -5.999999 z"
+           sodipodi:nodetypes="cccc" />
+      </g>
+      <path
+         id="path5661-2-42-7-3-5-1-1-7-1"
+         d="M 179.55898,163.67934 V 167"
+         style="display:inline;fill:none;stroke:#4d4d4d;stroke-width:0.25;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         sodipodi:nodetypes="cc" />
+      <rect
+         y="177.55898"
+         x="159.6844"
+         height="4.0000005"
+         width="3.9949403"
+         id="rect5659-1-1-1-8-2-2-99-3-0-0"
+         style="display:inline;fill:#ffffff;fill-opacity:1;stroke:#4d4d4d;stroke-width:0.199747;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+         transform="matrix(0,1,1,0,0,0)" />
+    </g>
+    <g
+       id="g10">
+      <g
+         id="g4-8-5"
+         style="display:inline;stroke-width:0.25;stroke-dasharray:none"
+         transform="translate(5.0000082,88.000003)">
+        <path
+           id="path25187-0-9-6-7-8-6-9-2-2-5-68-9-5-7-6-3-5-8-6-8-0-1-5-0-8-4-8-3-5-7-4-7-6-8"
+           style="fill:#ffffff;stroke:#4d4d4d;stroke-width:0.25;stroke-dasharray:none;stroke-opacity:1"
+           inkscape:transform-center-x="-0.80986268"
+           inkscape:transform-center-y="4.7081598e-05"
+           d="m 175,86.999998 5,2.999999 v -5.999999 z"
+           sodipodi:nodetypes="cccc" />
+        <path
+           id="path25187-0-9-6-7-8-6-9-2-2-5-68-9-5-7-6-3-5-8-6-8-0-1-5-0-8-4-8-3-5-2-5-5-6-8-8"
+           style="fill:#ffffff;stroke:#4d4d4d;stroke-width:0.25;stroke-dasharray:none;stroke-opacity:1"
+           inkscape:transform-center-x="0.80986732"
+           inkscape:transform-center-y="4.7081598e-05"
+           d="m 175,86.999998 -5,2.999999 v -5.999999 z"
+           sodipodi:nodetypes="cccc" />
+      </g>
+      <path
+         id="path5661-2-42-7-3-5-1-1-7-6"
+         d="M 180,171.67934 V 175"
+         style="display:inline;fill:none;stroke:#4d4d4d;stroke-width:0.25;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         sodipodi:nodetypes="cc" />
+      <rect
+         y="178"
+         x="167.6844"
+         height="4.0000005"
+         width="3.9949403"
+         id="rect5659-1-1-1-8-2-2-99-3-0-3"
+         style="display:inline;fill:#ffffff;fill-opacity:1;stroke:#4d4d4d;stroke-width:0.199747;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+         transform="matrix(0,1,1,0,0,0)" />
+    </g>
+    <g
+       id="g10-6"
+       style="display:inline"
+       transform="translate(-4.0583331e-6,9.9999938)">
+      <g
+         id="g4-8-5-9"
+         style="display:inline;stroke-width:0.25;stroke-dasharray:none"
+         transform="translate(5.0000082,88.000003)">
+        <path
+           id="path25187-0-9-6-7-8-6-9-2-2-5-68-9-5-7-6-3-5-8-6-8-0-1-5-0-8-4-8-3-5-7-4-7-6-8-6"
+           style="fill:#ffffff;stroke:#4d4d4d;stroke-width:0.25;stroke-dasharray:none;stroke-opacity:1"
+           inkscape:transform-center-x="-0.80986268"
+           inkscape:transform-center-y="4.7081598e-05"
+           d="m 175,86.999998 5,2.999999 v -5.999999 z"
+           sodipodi:nodetypes="cccc" />
+        <path
+           id="path25187-0-9-6-7-8-6-9-2-2-5-68-9-5-7-6-3-5-8-6-8-0-1-5-0-8-4-8-3-5-2-5-5-6-8-8-6"
+           style="fill:#ffffff;stroke:#4d4d4d;stroke-width:0.25;stroke-dasharray:none;stroke-opacity:1"
+           inkscape:transform-center-x="0.80986732"
+           inkscape:transform-center-y="4.7081598e-05"
+           d="m 175,86.999998 -5,2.999999 v -5.999999 z"
+           sodipodi:nodetypes="cccc" />
+      </g>
+      <path
+         id="path5661-2-42-7-3-5-1-1-7-6-2"
+         d="M 180,171.67934 V 175"
+         style="display:inline;fill:none;stroke:#4d4d4d;stroke-width:0.25;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         sodipodi:nodetypes="cc" />
+      <rect
+         y="178"
+         x="167.6844"
+         height="4.0000005"
+         width="3.9949403"
+         id="rect5659-1-1-1-8-2-2-99-3-0-3-4"
+         style="display:inline;fill:#ffffff;fill-opacity:1;stroke:#4d4d4d;stroke-width:0.199747;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+         transform="matrix(0,1,1,0,0,0)" />
+    </g>
+    <g
+       id="g4-8-7"
+       style="display:inline;stroke-width:0.25;stroke-dasharray:none"
+       transform="translate(90.00001,67.999999)">
+      <path
+         id="path25187-0-9-6-7-8-6-9-2-2-5-68-9-5-7-6-3-5-8-6-8-0-1-5-0-8-4-8-3-5-7-4-7-6-85"
+         style="fill:#ffffff;stroke:#4d4d4d;stroke-width:0.25;stroke-dasharray:none;stroke-opacity:1"
+         inkscape:transform-center-x="-0.80986268"
+         inkscape:transform-center-y="4.7081598e-05"
+         d="m 175,86.999998 5,2.999999 v -5.999999 z"
+         sodipodi:nodetypes="cccc" />
+      <path
+         id="path25187-0-9-6-7-8-6-9-2-2-5-68-9-5-7-6-3-5-8-6-8-0-1-5-0-8-4-8-3-5-2-5-5-6-8-89"
+         style="fill:#ffffff;stroke:#4d4d4d;stroke-width:0.25;stroke-dasharray:none;stroke-opacity:1"
+         inkscape:transform-center-x="0.80986732"
+         inkscape:transform-center-y="4.7081598e-05"
+         d="m 175,86.999998 -5,2.999999 v -5.999999 z"
+         sodipodi:nodetypes="cccc" />
+    </g>
+    <path
+       id="path5661-2-42-7-3-5-1-1-7-3"
+       d="M 265.00001,151.67934 V 155"
+       style="display:inline;fill:none;stroke:#4d4d4d;stroke-width:0.25;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       sodipodi:nodetypes="cc" />
+    <rect
+       y="263.00003"
+       x="147.6844"
+       height="4.0000005"
+       width="3.9949403"
+       id="rect5659-1-1-1-8-2-2-99-3-0-5"
+       style="display:inline;fill:#ffffff;fill-opacity:1;stroke:#4d4d4d;stroke-width:0.199747;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+       transform="matrix(0,1,1,0,0,0)" />
+    <g
+       id="g9-7"
+       transform="translate(85.441034,-2.0000042)"
+       style="display:inline">
+      <g
+         id="g4-8-1-3"
+         style="display:inline;stroke-width:0.25;stroke-dasharray:none"
+         transform="translate(4.5589824,79.999998)">
+        <path
+           id="path25187-0-9-6-7-8-6-9-2-2-5-68-9-5-7-6-3-5-8-6-8-0-1-5-0-8-4-8-3-5-7-4-7-6-9-0"
+           style="fill:#ffffff;stroke:#4d4d4d;stroke-width:0.25;stroke-dasharray:none;stroke-opacity:1"
+           inkscape:transform-center-x="-0.80986268"
+           inkscape:transform-center-y="4.7081598e-05"
+           d="m 175,86.999998 5,2.999999 v -5.999999 z"
+           sodipodi:nodetypes="cccc" />
+        <path
+           id="path25187-0-9-6-7-8-6-9-2-2-5-68-9-5-7-6-3-5-8-6-8-0-1-5-0-8-4-8-3-5-2-5-5-6-8-9-3"
+           style="fill:#ffffff;stroke:#4d4d4d;stroke-width:0.25;stroke-dasharray:none;stroke-opacity:1"
+           inkscape:transform-center-x="0.80986732"
+           inkscape:transform-center-y="4.7081598e-05"
+           d="m 175,86.999998 -5,2.999999 v -5.999999 z"
+           sodipodi:nodetypes="cccc" />
+      </g>
+      <path
+         id="path5661-2-42-7-3-5-1-1-7-1-3"
+         d="M 179.55898,163.67934 V 167"
+         style="display:inline;fill:none;stroke:#4d4d4d;stroke-width:0.25;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         sodipodi:nodetypes="cc" />
+      <rect
+         y="177.55898"
+         x="159.6844"
+         height="4.0000005"
+         width="3.9949403"
+         id="rect5659-1-1-1-8-2-2-99-3-0-0-2"
+         style="display:inline;fill:#ffffff;fill-opacity:1;stroke:#4d4d4d;stroke-width:0.199747;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+         transform="matrix(0,1,1,0,0,0)" />
+    </g>
+    <g
+       id="g10-9"
+       style="display:inline"
+       transform="translate(85.00001)">
+      <g
+         id="g4-8-5-3"
+         style="display:inline;stroke-width:0.25;stroke-dasharray:none"
+         transform="translate(5.0000082,88.000003)">
+        <path
+           id="path25187-0-9-6-7-8-6-9-2-2-5-68-9-5-7-6-3-5-8-6-8-0-1-5-0-8-4-8-3-5-7-4-7-6-8-4"
+           style="fill:#ffffff;stroke:#4d4d4d;stroke-width:0.25;stroke-dasharray:none;stroke-opacity:1"
+           inkscape:transform-center-x="-0.80986268"
+           inkscape:transform-center-y="4.7081598e-05"
+           d="m 175,86.999998 5,2.999999 v -5.999999 z"
+           sodipodi:nodetypes="cccc" />
+        <path
+           id="path25187-0-9-6-7-8-6-9-2-2-5-68-9-5-7-6-3-5-8-6-8-0-1-5-0-8-4-8-3-5-2-5-5-6-8-8-3"
+           style="fill:#ffffff;stroke:#4d4d4d;stroke-width:0.25;stroke-dasharray:none;stroke-opacity:1"
+           inkscape:transform-center-x="0.80986732"
+           inkscape:transform-center-y="4.7081598e-05"
+           d="m 175,86.999998 -5,2.999999 v -5.999999 z"
+           sodipodi:nodetypes="cccc" />
+      </g>
+      <path
+         id="path5661-2-42-7-3-5-1-1-7-6-5"
+         d="M 180,171.67934 V 175"
+         style="display:inline;fill:none;stroke:#4d4d4d;stroke-width:0.25;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         sodipodi:nodetypes="cc" />
+      <rect
+         y="178"
+         x="167.6844"
+         height="4.0000005"
+         width="3.9949403"
+         id="rect5659-1-1-1-8-2-2-99-3-0-3-5"
+         style="display:inline;fill:#ffffff;fill-opacity:1;stroke:#4d4d4d;stroke-width:0.199747;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+         transform="matrix(0,1,1,0,0,0)" />
+    </g>
+    <g
+       id="g10-6-1"
+       style="display:inline"
+       transform="translate(85.000006,9.9999948)">
+      <g
+         id="g4-8-5-9-7"
+         style="display:inline;stroke-width:0.25;stroke-dasharray:none"
+         transform="translate(5.0000082,88.000003)">
+        <path
+           id="path25187-0-9-6-7-8-6-9-2-2-5-68-9-5-7-6-3-5-8-6-8-0-1-5-0-8-4-8-3-5-7-4-7-6-8-6-9"
+           style="fill:#ffffff;stroke:#4d4d4d;stroke-width:0.25;stroke-dasharray:none;stroke-opacity:1"
+           inkscape:transform-center-x="-0.80986268"
+           inkscape:transform-center-y="4.7081598e-05"
+           d="m 175,86.999998 5,2.999999 v -5.999999 z"
+           sodipodi:nodetypes="cccc" />
+        <path
+           id="path25187-0-9-6-7-8-6-9-2-2-5-68-9-5-7-6-3-5-8-6-8-0-1-5-0-8-4-8-3-5-2-5-5-6-8-8-6-2"
+           style="fill:#ffffff;stroke:#4d4d4d;stroke-width:0.25;stroke-dasharray:none;stroke-opacity:1"
+           inkscape:transform-center-x="0.80986732"
+           inkscape:transform-center-y="4.7081598e-05"
+           d="m 175,86.999998 -5,2.999999 v -5.999999 z"
+           sodipodi:nodetypes="cccc" />
+      </g>
+      <path
+         id="path5661-2-42-7-3-5-1-1-7-6-2-5"
+         d="M 180,171.67934 V 175"
+         style="display:inline;fill:none;stroke:#4d4d4d;stroke-width:0.25;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         sodipodi:nodetypes="cc" />
+      <rect
+         y="178"
+         x="167.6844"
+         height="4.0000005"
+         width="3.9949403"
+         id="rect5659-1-1-1-8-2-2-99-3-0-3-4-5"
+         style="display:inline;fill:#ffffff;fill-opacity:1;stroke:#4d4d4d;stroke-width:0.199747;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+         transform="matrix(0,1,1,0,0,0)" />
+    </g>
+  </g>
+</svg>
diff --git a/Buildings/Resources/ReferenceResults/Dymola/Buildings_Experimental_DHC_EnergyTransferStations_BaseClasses_Validation_CollectorDistributor.txt b/Buildings/Resources/ReferenceResults/Dymola/Buildings_DHC_ETS_BaseClasses_Validation_CollectorDistributor.txt
similarity index 100%
rename from Buildings/Resources/ReferenceResults/Dymola/Buildings_Experimental_DHC_EnergyTransferStations_BaseClasses_Validation_CollectorDistributor.txt
rename to Buildings/Resources/ReferenceResults/Dymola/Buildings_DHC_ETS_BaseClasses_Validation_CollectorDistributor.txt
diff --git a/Buildings/Resources/ReferenceResults/Dymola/Buildings_Experimental_DHC_EnergyTransferStations_Combined_Examples_ChillerBorefield.txt b/Buildings/Resources/ReferenceResults/Dymola/Buildings_DHC_ETS_Combined_Examples_ChillerBorefield.txt
similarity index 100%
rename from Buildings/Resources/ReferenceResults/Dymola/Buildings_Experimental_DHC_EnergyTransferStations_Combined_Examples_ChillerBorefield.txt
rename to Buildings/Resources/ReferenceResults/Dymola/Buildings_DHC_ETS_Combined_Examples_ChillerBorefield.txt
diff --git a/Buildings/Resources/ReferenceResults/Dymola/Buildings_Experimental_DHC_EnergyTransferStations_Combined_Examples_ChillerOnly.txt b/Buildings/Resources/ReferenceResults/Dymola/Buildings_DHC_ETS_Combined_Examples_ChillerOnly.txt
similarity index 100%
rename from Buildings/Resources/ReferenceResults/Dymola/Buildings_Experimental_DHC_EnergyTransferStations_Combined_Examples_ChillerOnly.txt
rename to Buildings/Resources/ReferenceResults/Dymola/Buildings_DHC_ETS_Combined_Examples_ChillerOnly.txt
diff --git a/Buildings/Resources/ReferenceResults/Dymola/Buildings_Experimental_DHC_EnergyTransferStations_Combined_Subsystems_Validation_Borefield.txt b/Buildings/Resources/ReferenceResults/Dymola/Buildings_DHC_ETS_Combined_Subsystems_Validation_Borefield.txt
similarity index 100%
rename from Buildings/Resources/ReferenceResults/Dymola/Buildings_Experimental_DHC_EnergyTransferStations_Combined_Subsystems_Validation_Borefield.txt
rename to Buildings/Resources/ReferenceResults/Dymola/Buildings_DHC_ETS_Combined_Subsystems_Validation_Borefield.txt
diff --git a/Buildings/Resources/ReferenceResults/Dymola/Buildings_Experimental_DHC_EnergyTransferStations_Combined_Subsystems_Validation_Chiller.txt b/Buildings/Resources/ReferenceResults/Dymola/Buildings_DHC_ETS_Combined_Subsystems_Validation_Chiller.txt
similarity index 100%
rename from Buildings/Resources/ReferenceResults/Dymola/Buildings_Experimental_DHC_EnergyTransferStations_Combined_Subsystems_Validation_Chiller.txt
rename to Buildings/Resources/ReferenceResults/Dymola/Buildings_DHC_ETS_Combined_Subsystems_Validation_Chiller.txt
diff --git a/Buildings/Resources/ReferenceResults/Dymola/Buildings_Experimental_DHC_EnergyTransferStations_Combined_Subsystems_Validation_HeatExchanger.txt b/Buildings/Resources/ReferenceResults/Dymola/Buildings_DHC_ETS_Combined_Subsystems_Validation_HeatExchanger.txt
similarity index 100%
rename from Buildings/Resources/ReferenceResults/Dymola/Buildings_Experimental_DHC_EnergyTransferStations_Combined_Subsystems_Validation_HeatExchanger.txt
rename to Buildings/Resources/ReferenceResults/Dymola/Buildings_DHC_ETS_Combined_Subsystems_Validation_HeatExchanger.txt
diff --git a/Buildings/Resources/ReferenceResults/Dymola/Buildings_Experimental_DHC_EnergyTransferStations_Combined_Subsystems_Validation_HeatPump.txt b/Buildings/Resources/ReferenceResults/Dymola/Buildings_DHC_ETS_Combined_Subsystems_Validation_HeatPump.txt
similarity index 100%
rename from Buildings/Resources/ReferenceResults/Dymola/Buildings_Experimental_DHC_EnergyTransferStations_Combined_Subsystems_Validation_HeatPump.txt
rename to Buildings/Resources/ReferenceResults/Dymola/Buildings_DHC_ETS_Combined_Subsystems_Validation_HeatPump.txt
diff --git a/Buildings/Resources/ReferenceResults/Dymola/Buildings_Experimental_DHC_EnergyTransferStations_Combined_Subsystems_Validation_HeatPumpDHWTank.txt b/Buildings/Resources/ReferenceResults/Dymola/Buildings_DHC_ETS_Combined_Subsystems_Validation_HeatPumpDHWTank.txt
similarity index 100%
rename from Buildings/Resources/ReferenceResults/Dymola/Buildings_Experimental_DHC_EnergyTransferStations_Combined_Subsystems_Validation_HeatPumpDHWTank.txt
rename to Buildings/Resources/ReferenceResults/Dymola/Buildings_DHC_ETS_Combined_Subsystems_Validation_HeatPumpDHWTank.txt
diff --git a/Buildings/Resources/ReferenceResults/Dymola/Buildings_Experimental_DHC_EnergyTransferStations_Combined_Subsystems_Validation_SwitchBox.txt b/Buildings/Resources/ReferenceResults/Dymola/Buildings_DHC_ETS_Combined_Subsystems_Validation_SwitchBox.txt
similarity index 100%
rename from Buildings/Resources/ReferenceResults/Dymola/Buildings_Experimental_DHC_EnergyTransferStations_Combined_Subsystems_Validation_SwitchBox.txt
rename to Buildings/Resources/ReferenceResults/Dymola/Buildings_DHC_ETS_Combined_Subsystems_Validation_SwitchBox.txt
diff --git a/Buildings/Resources/ReferenceResults/Dymola/Buildings_Experimental_DHC_EnergyTransferStations_Combined_Subsystems_Validation_WatersideEconomizer.txt b/Buildings/Resources/ReferenceResults/Dymola/Buildings_DHC_ETS_Combined_Subsystems_Validation_WatersideEconomizer.txt
similarity index 100%
rename from Buildings/Resources/ReferenceResults/Dymola/Buildings_Experimental_DHC_EnergyTransferStations_Combined_Subsystems_Validation_WatersideEconomizer.txt
rename to Buildings/Resources/ReferenceResults/Dymola/Buildings_DHC_ETS_Combined_Subsystems_Validation_WatersideEconomizer.txt
diff --git a/Buildings/Resources/ReferenceResults/Dymola/Buildings_Experimental_DHC_EnergyTransferStations_Combined_Validation_ChillerBorefield.txt b/Buildings/Resources/ReferenceResults/Dymola/Buildings_DHC_ETS_Combined_Validation_ChillerBorefield.txt
similarity index 100%
rename from Buildings/Resources/ReferenceResults/Dymola/Buildings_Experimental_DHC_EnergyTransferStations_Combined_Validation_ChillerBorefield.txt
rename to Buildings/Resources/ReferenceResults/Dymola/Buildings_DHC_ETS_Combined_Validation_ChillerBorefield.txt
diff --git a/Buildings/Resources/ReferenceResults/Dymola/Buildings_Experimental_DHC_EnergyTransferStations_Combined_Validation_ChillerOnly.txt b/Buildings/Resources/ReferenceResults/Dymola/Buildings_DHC_ETS_Combined_Validation_ChillerOnly.txt
similarity index 100%
rename from Buildings/Resources/ReferenceResults/Dymola/Buildings_Experimental_DHC_EnergyTransferStations_Combined_Validation_ChillerOnly.txt
rename to Buildings/Resources/ReferenceResults/Dymola/Buildings_DHC_ETS_Combined_Validation_ChillerOnly.txt
diff --git a/Buildings/Resources/ReferenceResults/Dymola/Buildings_Experimental_DHC_EnergyTransferStations_Combined_Validation_ChillerWSE.txt b/Buildings/Resources/ReferenceResults/Dymola/Buildings_DHC_ETS_Combined_Validation_ChillerWSE.txt
similarity index 100%
rename from Buildings/Resources/ReferenceResults/Dymola/Buildings_Experimental_DHC_EnergyTransferStations_Combined_Validation_ChillerWSE.txt
rename to Buildings/Resources/ReferenceResults/Dymola/Buildings_DHC_ETS_Combined_Validation_ChillerWSE.txt
diff --git a/Buildings/Resources/ReferenceResults/Dymola/Buildings_Experimental_DHC_EnergyTransferStations_Cooling_Examples_Direct.txt b/Buildings/Resources/ReferenceResults/Dymola/Buildings_DHC_ETS_Cooling_Examples_Direct.txt
similarity index 100%
rename from Buildings/Resources/ReferenceResults/Dymola/Buildings_Experimental_DHC_EnergyTransferStations_Cooling_Examples_Direct.txt
rename to Buildings/Resources/ReferenceResults/Dymola/Buildings_DHC_ETS_Cooling_Examples_Direct.txt
diff --git a/Buildings/Resources/ReferenceResults/Dymola/Buildings_Experimental_DHC_EnergyTransferStations_Cooling_Examples_Indirect.txt b/Buildings/Resources/ReferenceResults/Dymola/Buildings_DHC_ETS_Cooling_Examples_Indirect.txt
similarity index 100%
rename from Buildings/Resources/ReferenceResults/Dymola/Buildings_Experimental_DHC_EnergyTransferStations_Cooling_Examples_Indirect.txt
rename to Buildings/Resources/ReferenceResults/Dymola/Buildings_DHC_ETS_Cooling_Examples_Indirect.txt
diff --git a/Buildings/Resources/ReferenceResults/Dymola/Buildings_Experimental_DHC_EnergyTransferStations_Heating_Examples_Direct.txt b/Buildings/Resources/ReferenceResults/Dymola/Buildings_DHC_ETS_Heating_Examples_Direct.txt
similarity index 100%
rename from Buildings/Resources/ReferenceResults/Dymola/Buildings_Experimental_DHC_EnergyTransferStations_Heating_Examples_Direct.txt
rename to Buildings/Resources/ReferenceResults/Dymola/Buildings_DHC_ETS_Heating_Examples_Direct.txt
diff --git a/Buildings/Resources/ReferenceResults/Dymola/Buildings_Experimental_DHC_EnergyTransferStations_Heating_Examples_Indirect.txt b/Buildings/Resources/ReferenceResults/Dymola/Buildings_DHC_ETS_Heating_Examples_Indirect.txt
similarity index 100%
rename from Buildings/Resources/ReferenceResults/Dymola/Buildings_Experimental_DHC_EnergyTransferStations_Heating_Examples_Indirect.txt
rename to Buildings/Resources/ReferenceResults/Dymola/Buildings_DHC_ETS_Heating_Examples_Indirect.txt
diff --git a/Buildings/Resources/ReferenceResults/Dymola/Buildings_Experimental_DHC_Examples_Combined_SeriesConstantFlow.txt b/Buildings/Resources/ReferenceResults/Dymola/Buildings_DHC_Examples_Combined_SeriesConstantFlow.txt
similarity index 100%
rename from Buildings/Resources/ReferenceResults/Dymola/Buildings_Experimental_DHC_Examples_Combined_SeriesConstantFlow.txt
rename to Buildings/Resources/ReferenceResults/Dymola/Buildings_DHC_Examples_Combined_SeriesConstantFlow.txt
diff --git a/Buildings/Resources/ReferenceResults/Dymola/Buildings_Experimental_DHC_Examples_Combined_SeriesVariableFlow.txt b/Buildings/Resources/ReferenceResults/Dymola/Buildings_DHC_Examples_Combined_SeriesVariableFlow.txt
similarity index 100%
rename from Buildings/Resources/ReferenceResults/Dymola/Buildings_Experimental_DHC_Examples_Combined_SeriesVariableFlow.txt
rename to Buildings/Resources/ReferenceResults/Dymola/Buildings_DHC_Examples_Combined_SeriesVariableFlow.txt
diff --git a/Buildings/Resources/ReferenceResults/Dymola/Buildings_Experimental_DHC_Examples_Combined_SeriesVariableFlowAgentControl.txt b/Buildings/Resources/ReferenceResults/Dymola/Buildings_DHC_Examples_Combined_SeriesVariableFlowAgentControl.txt
similarity index 100%
rename from Buildings/Resources/ReferenceResults/Dymola/Buildings_Experimental_DHC_Examples_Combined_SeriesVariableFlowAgentControl.txt
rename to Buildings/Resources/ReferenceResults/Dymola/Buildings_DHC_Examples_Combined_SeriesVariableFlowAgentControl.txt
diff --git a/Buildings/Resources/ReferenceResults/Dymola/Buildings_Experimental_DHC_Examples_Cooling_ElectricChillersDirectETS.txt b/Buildings/Resources/ReferenceResults/Dymola/Buildings_DHC_Examples_Cooling_ElectricChillersDirectETS.txt
similarity index 100%
rename from Buildings/Resources/ReferenceResults/Dymola/Buildings_Experimental_DHC_Examples_Cooling_ElectricChillersDirectETS.txt
rename to Buildings/Resources/ReferenceResults/Dymola/Buildings_DHC_Examples_Cooling_ElectricChillersDirectETS.txt
diff --git a/Buildings/Resources/ReferenceResults/Dymola/Buildings_Experimental_DHC_Examples_Steam_SingleBoiler.txt b/Buildings/Resources/ReferenceResults/Dymola/Buildings_DHC_Examples_Steam_SingleBoiler.txt
similarity index 100%
rename from Buildings/Resources/ReferenceResults/Dymola/Buildings_Experimental_DHC_Examples_Steam_SingleBoiler.txt
rename to Buildings/Resources/ReferenceResults/Dymola/Buildings_DHC_Examples_Steam_SingleBoiler.txt
diff --git a/Buildings/Resources/ReferenceResults/Dymola/Buildings_Experimental_DHC_Loads_BaseClasses_Controls_Validation_MixingValveControl.txt b/Buildings/Resources/ReferenceResults/Dymola/Buildings_DHC_Loads_BaseClasses_Controls_Validation_MixingValveControl.txt
similarity index 100%
rename from Buildings/Resources/ReferenceResults/Dymola/Buildings_Experimental_DHC_Loads_BaseClasses_Controls_Validation_MixingValveControl.txt
rename to Buildings/Resources/ReferenceResults/Dymola/Buildings_DHC_Loads_BaseClasses_Controls_Validation_MixingValveControl.txt
diff --git a/Buildings/Resources/ReferenceResults/Dymola/Buildings_Experimental_DHC_Loads_BaseClasses_Examples_CouplingRCZ1Valve.txt b/Buildings/Resources/ReferenceResults/Dymola/Buildings_DHC_Loads_BaseClasses_Examples_CouplingRCZ1Valve.txt
similarity index 100%
rename from Buildings/Resources/ReferenceResults/Dymola/Buildings_Experimental_DHC_Loads_BaseClasses_Examples_CouplingRCZ1Valve.txt
rename to Buildings/Resources/ReferenceResults/Dymola/Buildings_DHC_Loads_BaseClasses_Examples_CouplingRCZ1Valve.txt
diff --git a/Buildings/Resources/ReferenceResults/Dymola/Buildings_Experimental_DHC_Loads_BaseClasses_Examples_CouplingRCZ6.txt b/Buildings/Resources/ReferenceResults/Dymola/Buildings_DHC_Loads_BaseClasses_Examples_CouplingRCZ6.txt
similarity index 100%
rename from Buildings/Resources/ReferenceResults/Dymola/Buildings_Experimental_DHC_Loads_BaseClasses_Examples_CouplingRCZ6.txt
rename to Buildings/Resources/ReferenceResults/Dymola/Buildings_DHC_Loads_BaseClasses_Examples_CouplingRCZ6.txt
diff --git a/Buildings/Resources/ReferenceResults/Dymola/Buildings_Experimental_DHC_Loads_BaseClasses_Examples_CouplingSpawnZ1.txt b/Buildings/Resources/ReferenceResults/Dymola/Buildings_DHC_Loads_BaseClasses_Examples_CouplingSpawnZ1.txt
similarity index 100%
rename from Buildings/Resources/ReferenceResults/Dymola/Buildings_Experimental_DHC_Loads_BaseClasses_Examples_CouplingSpawnZ1.txt
rename to Buildings/Resources/ReferenceResults/Dymola/Buildings_DHC_Loads_BaseClasses_Examples_CouplingSpawnZ1.txt
diff --git a/Buildings/Resources/ReferenceResults/Dymola/Buildings_Experimental_DHC_Loads_BaseClasses_Examples_CouplingSpawnZ6.txt b/Buildings/Resources/ReferenceResults/Dymola/Buildings_DHC_Loads_BaseClasses_Examples_CouplingSpawnZ6.txt
similarity index 100%
rename from Buildings/Resources/ReferenceResults/Dymola/Buildings_Experimental_DHC_Loads_BaseClasses_Examples_CouplingSpawnZ6.txt
rename to Buildings/Resources/ReferenceResults/Dymola/Buildings_DHC_Loads_BaseClasses_Examples_CouplingSpawnZ6.txt
diff --git a/Buildings/Resources/ReferenceResults/Dymola/Buildings_Experimental_DHC_Loads_BaseClasses_Examples_CouplingTimeSeries.txt b/Buildings/Resources/ReferenceResults/Dymola/Buildings_DHC_Loads_BaseClasses_Examples_CouplingTimeSeries.txt
similarity index 100%
rename from Buildings/Resources/ReferenceResults/Dymola/Buildings_Experimental_DHC_Loads_BaseClasses_Examples_CouplingTimeSeries.txt
rename to Buildings/Resources/ReferenceResults/Dymola/Buildings_DHC_Loads_BaseClasses_Examples_CouplingTimeSeries.txt
diff --git a/Buildings/Resources/ReferenceResults/Dymola/Buildings_Experimental_DHC_Loads_BaseClasses_Examples_CouplingTimeSeriesSingleLoop.txt b/Buildings/Resources/ReferenceResults/Dymola/Buildings_DHC_Loads_BaseClasses_Examples_CouplingTimeSeriesSingleLoop.txt
similarity index 100%
rename from Buildings/Resources/ReferenceResults/Dymola/Buildings_Experimental_DHC_Loads_BaseClasses_Examples_CouplingTimeSeriesSingleLoop.txt
rename to Buildings/Resources/ReferenceResults/Dymola/Buildings_DHC_Loads_BaseClasses_Examples_CouplingTimeSeriesSingleLoop.txt
diff --git a/Buildings/Resources/ReferenceResults/Dymola/Buildings_Experimental_DHC_Loads_BaseClasses_Validation_BenchmarkFlowDistribution1.txt b/Buildings/Resources/ReferenceResults/Dymola/Buildings_DHC_Loads_BaseClasses_Validation_BenchmarkFlowDistribution1.txt
similarity index 100%
rename from Buildings/Resources/ReferenceResults/Dymola/Buildings_Experimental_DHC_Loads_BaseClasses_Validation_BenchmarkFlowDistribution1.txt
rename to Buildings/Resources/ReferenceResults/Dymola/Buildings_DHC_Loads_BaseClasses_Validation_BenchmarkFlowDistribution1.txt
diff --git a/Buildings/Resources/ReferenceResults/Dymola/Buildings_Experimental_DHC_Loads_BaseClasses_Validation_BenchmarkFlowDistribution2.txt b/Buildings/Resources/ReferenceResults/Dymola/Buildings_DHC_Loads_BaseClasses_Validation_BenchmarkFlowDistribution2.txt
similarity index 100%
rename from Buildings/Resources/ReferenceResults/Dymola/Buildings_Experimental_DHC_Loads_BaseClasses_Validation_BenchmarkFlowDistribution2.txt
rename to Buildings/Resources/ReferenceResults/Dymola/Buildings_DHC_Loads_BaseClasses_Validation_BenchmarkFlowDistribution2.txt
diff --git a/Buildings/Resources/ReferenceResults/Dymola/Buildings_Experimental_DHC_Loads_BaseClasses_Validation_BuildingWithETS.txt b/Buildings/Resources/ReferenceResults/Dymola/Buildings_DHC_Loads_BaseClasses_Validation_BuildingWithETS.txt
similarity index 100%
rename from Buildings/Resources/ReferenceResults/Dymola/Buildings_Experimental_DHC_Loads_BaseClasses_Validation_BuildingWithETS.txt
rename to Buildings/Resources/ReferenceResults/Dymola/Buildings_DHC_Loads_BaseClasses_Validation_BuildingWithETS.txt
diff --git a/Buildings/Resources/ReferenceResults/Dymola/Buildings_Experimental_DHC_Loads_BaseClasses_Validation_FlowDistributionPumpControl.txt b/Buildings/Resources/ReferenceResults/Dymola/Buildings_DHC_Loads_BaseClasses_Validation_FlowDistributionPumpControl.txt
similarity index 100%
rename from Buildings/Resources/ReferenceResults/Dymola/Buildings_Experimental_DHC_Loads_BaseClasses_Validation_FlowDistributionPumpControl.txt
rename to Buildings/Resources/ReferenceResults/Dymola/Buildings_DHC_Loads_BaseClasses_Validation_FlowDistributionPumpControl.txt
diff --git a/Buildings/Resources/ReferenceResults/Dymola/Buildings_Experimental_DHC_Loads_BaseClasses_Validation_GetPeakLoad.txt b/Buildings/Resources/ReferenceResults/Dymola/Buildings_DHC_Loads_BaseClasses_Validation_GetPeakLoad.txt
similarity index 100%
rename from Buildings/Resources/ReferenceResults/Dymola/Buildings_Experimental_DHC_Loads_BaseClasses_Validation_GetPeakLoad.txt
rename to Buildings/Resources/ReferenceResults/Dymola/Buildings_DHC_Loads_BaseClasses_Validation_GetPeakLoad.txt
diff --git a/Buildings/Resources/ReferenceResults/Dymola/Buildings_Experimental_DHC_Loads_BaseClasses_Validation_SimpleRoomODE.txt b/Buildings/Resources/ReferenceResults/Dymola/Buildings_DHC_Loads_BaseClasses_Validation_SimpleRoomODE.txt
similarity index 100%
rename from Buildings/Resources/ReferenceResults/Dymola/Buildings_Experimental_DHC_Loads_BaseClasses_Validation_SimpleRoomODE.txt
rename to Buildings/Resources/ReferenceResults/Dymola/Buildings_DHC_Loads_BaseClasses_Validation_SimpleRoomODE.txt
diff --git a/Buildings/Resources/ReferenceResults/Dymola/Buildings_Experimental_DHC_Loads_BaseClasses_Validation_TerminalUnitScaling.txt b/Buildings/Resources/ReferenceResults/Dymola/Buildings_DHC_Loads_BaseClasses_Validation_TerminalUnitScaling.txt
similarity index 100%
rename from Buildings/Resources/ReferenceResults/Dymola/Buildings_Experimental_DHC_Loads_BaseClasses_Validation_TerminalUnitScaling.txt
rename to Buildings/Resources/ReferenceResults/Dymola/Buildings_DHC_Loads_BaseClasses_Validation_TerminalUnitScaling.txt
diff --git a/Buildings/Resources/ReferenceResults/Dymola/Buildings_Experimental_DHC_Loads_Combined_Examples_BuildingTimeSeriesWithETS.txt b/Buildings/Resources/ReferenceResults/Dymola/Buildings_DHC_Loads_Combined_Examples_BuildingTimeSeriesWithETS.txt
similarity index 100%
rename from Buildings/Resources/ReferenceResults/Dymola/Buildings_Experimental_DHC_Loads_Combined_Examples_BuildingTimeSeriesWithETS.txt
rename to Buildings/Resources/ReferenceResults/Dymola/Buildings_DHC_Loads_Combined_Examples_BuildingTimeSeriesWithETS.txt
diff --git a/Buildings/Resources/ReferenceResults/Dymola/Buildings_Experimental_DHC_Loads_Combined_Examples_BuildingTimeSeriesWithETSDHWTank.txt b/Buildings/Resources/ReferenceResults/Dymola/Buildings_DHC_Loads_Combined_Examples_BuildingTimeSeriesWithETSDHWTank.txt
similarity index 100%
rename from Buildings/Resources/ReferenceResults/Dymola/Buildings_Experimental_DHC_Loads_Combined_Examples_BuildingTimeSeriesWithETSDHWTank.txt
rename to Buildings/Resources/ReferenceResults/Dymola/Buildings_DHC_Loads_Combined_Examples_BuildingTimeSeriesWithETSDHWTank.txt
diff --git a/Buildings/Resources/ReferenceResults/Dymola/Buildings_Experimental_DHC_Loads_Cooling_Examples_BuildingTimeSeriesWithETS.txt b/Buildings/Resources/ReferenceResults/Dymola/Buildings_DHC_Loads_Cooling_Examples_BuildingTimeSeriesWithETS.txt
similarity index 100%
rename from Buildings/Resources/ReferenceResults/Dymola/Buildings_Experimental_DHC_Loads_Cooling_Examples_BuildingTimeSeriesWithETS.txt
rename to Buildings/Resources/ReferenceResults/Dymola/Buildings_DHC_Loads_Cooling_Examples_BuildingTimeSeriesWithETS.txt
diff --git a/Buildings/Resources/ReferenceResults/Dymola/Buildings_Experimental_DHC_Loads_Heating_Examples_BuildingTimeSeriesWithETS.txt b/Buildings/Resources/ReferenceResults/Dymola/Buildings_DHC_Loads_Heating_Examples_BuildingTimeSeriesWithETS.txt
similarity index 100%
rename from Buildings/Resources/ReferenceResults/Dymola/Buildings_Experimental_DHC_Loads_Heating_Examples_BuildingTimeSeriesWithETS.txt
rename to Buildings/Resources/ReferenceResults/Dymola/Buildings_DHC_Loads_Heating_Examples_BuildingTimeSeriesWithETS.txt
diff --git a/Buildings/Resources/ReferenceResults/Dymola/Buildings_Experimental_DHC_Loads_HotWater_Examples_HeaterAndFixtureDirectHeatExchangerWithElectricHeat.txt b/Buildings/Resources/ReferenceResults/Dymola/Buildings_DHC_Loads_HotWater_Examples_HeaterAndFixtureDirectHeatExchangerWithElectricHeat.txt
similarity index 100%
rename from Buildings/Resources/ReferenceResults/Dymola/Buildings_Experimental_DHC_Loads_HotWater_Examples_HeaterAndFixtureDirectHeatExchangerWithElectricHeat.txt
rename to Buildings/Resources/ReferenceResults/Dymola/Buildings_DHC_Loads_HotWater_Examples_HeaterAndFixtureDirectHeatExchangerWithElectricHeat.txt
diff --git a/Buildings/Resources/ReferenceResults/Dymola/Buildings_Experimental_DHC_Loads_HotWater_Examples_StorageTankWithExternalHeatExchanger.txt b/Buildings/Resources/ReferenceResults/Dymola/Buildings_DHC_Loads_HotWater_Examples_StorageTankWithExternalHeatExchanger.txt
similarity index 100%
rename from Buildings/Resources/ReferenceResults/Dymola/Buildings_Experimental_DHC_Loads_HotWater_Examples_StorageTankWithExternalHeatExchanger.txt
rename to Buildings/Resources/ReferenceResults/Dymola/Buildings_DHC_Loads_HotWater_Examples_StorageTankWithExternalHeatExchanger.txt
diff --git a/Buildings/Resources/ReferenceResults/Dymola/Buildings_Experimental_DHC_Loads_Steam_BaseClasses_Examples_ControlVolumeCondensation.txt b/Buildings/Resources/ReferenceResults/Dymola/Buildings_DHC_Loads_Steam_BaseClasses_Examples_ControlVolumeCondensation.txt
similarity index 100%
rename from Buildings/Resources/ReferenceResults/Dymola/Buildings_Experimental_DHC_Loads_Steam_BaseClasses_Examples_ControlVolumeCondensation.txt
rename to Buildings/Resources/ReferenceResults/Dymola/Buildings_DHC_Loads_Steam_BaseClasses_Examples_ControlVolumeCondensation.txt
diff --git a/Buildings/Resources/ReferenceResults/Dymola/Buildings_Experimental_DHC_Loads_Steam_BaseClasses_Examples_SteamTrap.txt b/Buildings/Resources/ReferenceResults/Dymola/Buildings_DHC_Loads_Steam_BaseClasses_Examples_SteamTrap.txt
similarity index 100%
rename from Buildings/Resources/ReferenceResults/Dymola/Buildings_Experimental_DHC_Loads_Steam_BaseClasses_Examples_SteamTrap.txt
rename to Buildings/Resources/ReferenceResults/Dymola/Buildings_DHC_Loads_Steam_BaseClasses_Examples_SteamTrap.txt
diff --git a/Buildings/Resources/ReferenceResults/Dymola/Buildings_Experimental_DHC_Loads_Steam_BaseClasses_Examples_ValveSelfActing.txt b/Buildings/Resources/ReferenceResults/Dymola/Buildings_DHC_Loads_Steam_BaseClasses_Examples_ValveSelfActing.txt
similarity index 100%
rename from Buildings/Resources/ReferenceResults/Dymola/Buildings_Experimental_DHC_Loads_Steam_BaseClasses_Examples_ValveSelfActing.txt
rename to Buildings/Resources/ReferenceResults/Dymola/Buildings_DHC_Loads_Steam_BaseClasses_Examples_ValveSelfActing.txt
diff --git a/Buildings/Resources/ReferenceResults/Dymola/Buildings_Experimental_DHC_Loads_Steam_Examples_BuildingTimeSeriesAtETS.txt b/Buildings/Resources/ReferenceResults/Dymola/Buildings_DHC_Loads_Steam_Examples_BuildingTimeSeriesAtETS.txt
similarity index 100%
rename from Buildings/Resources/ReferenceResults/Dymola/Buildings_Experimental_DHC_Loads_Steam_Examples_BuildingTimeSeriesAtETS.txt
rename to Buildings/Resources/ReferenceResults/Dymola/Buildings_DHC_Loads_Steam_Examples_BuildingTimeSeriesAtETS.txt
diff --git a/Buildings/Resources/ReferenceResults/Dymola/Buildings_Experimental_DHC_Networks_Connections_Examples_Connection1PipeExample.txt b/Buildings/Resources/ReferenceResults/Dymola/Buildings_DHC_Networks_Connections_Examples_Connection1PipeExample.txt
similarity index 100%
rename from Buildings/Resources/ReferenceResults/Dymola/Buildings_Experimental_DHC_Networks_Connections_Examples_Connection1PipeExample.txt
rename to Buildings/Resources/ReferenceResults/Dymola/Buildings_DHC_Networks_Connections_Examples_Connection1PipeExample.txt
diff --git a/Buildings/Resources/ReferenceResults/Dymola/Buildings_Experimental_DHC_Networks_Connections_Examples_Connection2PipeExample.txt b/Buildings/Resources/ReferenceResults/Dymola/Buildings_DHC_Networks_Connections_Examples_Connection2PipeExample.txt
similarity index 100%
rename from Buildings/Resources/ReferenceResults/Dymola/Buildings_Experimental_DHC_Networks_Connections_Examples_Connection2PipeExample.txt
rename to Buildings/Resources/ReferenceResults/Dymola/Buildings_DHC_Networks_Connections_Examples_Connection2PipeExample.txt
diff --git a/Buildings/Resources/ReferenceResults/Dymola/Buildings_Experimental_DHC_Networks_Controls_Examples_AgentPump1PipeExample.txt b/Buildings/Resources/ReferenceResults/Dymola/Buildings_DHC_Networks_Controls_Examples_AgentPump1PipeExample.txt
similarity index 100%
rename from Buildings/Resources/ReferenceResults/Dymola/Buildings_Experimental_DHC_Networks_Controls_Examples_AgentPump1PipeExample.txt
rename to Buildings/Resources/ReferenceResults/Dymola/Buildings_DHC_Networks_Controls_Examples_AgentPump1PipeExample.txt
diff --git a/Buildings/Resources/ReferenceResults/Dymola/Buildings_Experimental_DHC_Networks_Controls_Examples_MainPump1PipeExample.txt b/Buildings/Resources/ReferenceResults/Dymola/Buildings_DHC_Networks_Controls_Examples_MainPump1PipeExample.txt
similarity index 100%
rename from Buildings/Resources/ReferenceResults/Dymola/Buildings_Experimental_DHC_Networks_Controls_Examples_MainPump1PipeExample.txt
rename to Buildings/Resources/ReferenceResults/Dymola/Buildings_DHC_Networks_Controls_Examples_MainPump1PipeExample.txt
diff --git a/Buildings/Resources/ReferenceResults/Dymola/Buildings_Experimental_DHC_Networks_Examples_Distribution1PipeExample.txt b/Buildings/Resources/ReferenceResults/Dymola/Buildings_DHC_Networks_Examples_Distribution1PipeExample.txt
similarity index 100%
rename from Buildings/Resources/ReferenceResults/Dymola/Buildings_Experimental_DHC_Networks_Examples_Distribution1PipeExample.txt
rename to Buildings/Resources/ReferenceResults/Dymola/Buildings_DHC_Networks_Examples_Distribution1PipeExample.txt
diff --git a/Buildings/Resources/ReferenceResults/Dymola/Buildings_Experimental_DHC_Networks_Examples_Distribution2PipeExample.txt b/Buildings/Resources/ReferenceResults/Dymola/Buildings_DHC_Networks_Examples_Distribution2PipeExample.txt
similarity index 100%
rename from Buildings/Resources/ReferenceResults/Dymola/Buildings_Experimental_DHC_Networks_Examples_Distribution2PipeExample.txt
rename to Buildings/Resources/ReferenceResults/Dymola/Buildings_DHC_Networks_Examples_Distribution2PipeExample.txt
diff --git a/Buildings/Resources/ReferenceResults/Dymola/Buildings_Experimental_DHC_Networks_Pipes_Validation_Pipe.txt b/Buildings/Resources/ReferenceResults/Dymola/Buildings_DHC_Networks_Pipes_Validation_Pipe.txt
similarity index 100%
rename from Buildings/Resources/ReferenceResults/Dymola/Buildings_Experimental_DHC_Networks_Pipes_Validation_Pipe.txt
rename to Buildings/Resources/ReferenceResults/Dymola/Buildings_DHC_Networks_Pipes_Validation_Pipe.txt
diff --git a/Buildings/Resources/ReferenceResults/Dymola/Buildings_Experimental_DHC_Networks_Steam_Examples_ConnectionCondensatePipe.txt b/Buildings/Resources/ReferenceResults/Dymola/Buildings_DHC_Networks_Steam_Examples_ConnectionCondensatePipe.txt
similarity index 100%
rename from Buildings/Resources/ReferenceResults/Dymola/Buildings_Experimental_DHC_Networks_Steam_Examples_ConnectionCondensatePipe.txt
rename to Buildings/Resources/ReferenceResults/Dymola/Buildings_DHC_Networks_Steam_Examples_ConnectionCondensatePipe.txt
diff --git a/Buildings/Resources/ReferenceResults/Dymola/Buildings_Experimental_DHC_Networks_Steam_Examples_DistributionCondensatePipe.txt b/Buildings/Resources/ReferenceResults/Dymola/Buildings_DHC_Networks_Steam_Examples_DistributionCondensatePipe.txt
similarity index 100%
rename from Buildings/Resources/ReferenceResults/Dymola/Buildings_Experimental_DHC_Networks_Steam_Examples_DistributionCondensatePipe.txt
rename to Buildings/Resources/ReferenceResults/Dymola/Buildings_DHC_Networks_Steam_Examples_DistributionCondensatePipe.txt
diff --git a/Buildings/Resources/ReferenceResults/Dymola/Buildings_Experimental_DHC_Plants_Combined_Controls_BaseClasses_Validation_StageIndex.txt b/Buildings/Resources/ReferenceResults/Dymola/Buildings_DHC_Plants_Combined_Controls_BaseClasses_Validation_StageIndex.txt
similarity index 100%
rename from Buildings/Resources/ReferenceResults/Dymola/Buildings_Experimental_DHC_Plants_Combined_Controls_BaseClasses_Validation_StageIndex.txt
rename to Buildings/Resources/ReferenceResults/Dymola/Buildings_DHC_Plants_Combined_Controls_BaseClasses_Validation_StageIndex.txt
diff --git a/Buildings/Resources/ReferenceResults/Dymola/Buildings_Experimental_DHC_Plants_Combined_Controls_BaseClasses_Validation_StagingPlant.txt b/Buildings/Resources/ReferenceResults/Dymola/Buildings_DHC_Plants_Combined_Controls_BaseClasses_Validation_StagingPlant.txt
similarity index 100%
rename from Buildings/Resources/ReferenceResults/Dymola/Buildings_Experimental_DHC_Plants_Combined_Controls_BaseClasses_Validation_StagingPlant.txt
rename to Buildings/Resources/ReferenceResults/Dymola/Buildings_DHC_Plants_Combined_Controls_BaseClasses_Validation_StagingPlant.txt
diff --git a/Buildings/Resources/ReferenceResults/Dymola/Buildings_Experimental_DHC_Plants_Combined_Controls_BaseClasses_Validation_StagingPump.txt b/Buildings/Resources/ReferenceResults/Dymola/Buildings_DHC_Plants_Combined_Controls_BaseClasses_Validation_StagingPump.txt
similarity index 100%
rename from Buildings/Resources/ReferenceResults/Dymola/Buildings_Experimental_DHC_Plants_Combined_Controls_BaseClasses_Validation_StagingPump.txt
rename to Buildings/Resources/ReferenceResults/Dymola/Buildings_DHC_Plants_Combined_Controls_BaseClasses_Validation_StagingPump.txt
diff --git a/Buildings/Resources/ReferenceResults/Dymola/Buildings_Experimental_DHC_Plants_Combined_Examples_AllElectricCWStorage.txt b/Buildings/Resources/ReferenceResults/Dymola/Buildings_DHC_Plants_Combined_Examples_AllElectricCWStorage.txt
similarity index 100%
rename from Buildings/Resources/ReferenceResults/Dymola/Buildings_Experimental_DHC_Plants_Combined_Examples_AllElectricCWStorage.txt
rename to Buildings/Resources/ReferenceResults/Dymola/Buildings_DHC_Plants_Combined_Examples_AllElectricCWStorage.txt
diff --git a/Buildings/Resources/ReferenceResults/Dymola/Buildings_Experimental_DHC_Plants_Combined_Subsystems_Validation_ChillerGroup.txt b/Buildings/Resources/ReferenceResults/Dymola/Buildings_DHC_Plants_Combined_Subsystems_Validation_ChillerGroup.txt
similarity index 100%
rename from Buildings/Resources/ReferenceResults/Dymola/Buildings_Experimental_DHC_Plants_Combined_Subsystems_Validation_ChillerGroup.txt
rename to Buildings/Resources/ReferenceResults/Dymola/Buildings_DHC_Plants_Combined_Subsystems_Validation_ChillerGroup.txt
diff --git a/Buildings/Resources/ReferenceResults/Dymola/Buildings_Experimental_DHC_Plants_Combined_Subsystems_Validation_ChillerHeatRecoveryGroup.txt b/Buildings/Resources/ReferenceResults/Dymola/Buildings_DHC_Plants_Combined_Subsystems_Validation_ChillerHeatRecoveryGroup.txt
similarity index 100%
rename from Buildings/Resources/ReferenceResults/Dymola/Buildings_Experimental_DHC_Plants_Combined_Subsystems_Validation_ChillerHeatRecoveryGroup.txt
rename to Buildings/Resources/ReferenceResults/Dymola/Buildings_DHC_Plants_Combined_Subsystems_Validation_ChillerHeatRecoveryGroup.txt
diff --git a/Buildings/Resources/ReferenceResults/Dymola/Buildings_Experimental_DHC_Plants_Combined_Subsystems_Validation_CoolingTowerGroup.txt b/Buildings/Resources/ReferenceResults/Dymola/Buildings_DHC_Plants_Combined_Subsystems_Validation_CoolingTowerGroup.txt
similarity index 100%
rename from Buildings/Resources/ReferenceResults/Dymola/Buildings_Experimental_DHC_Plants_Combined_Subsystems_Validation_CoolingTowerGroup.txt
rename to Buildings/Resources/ReferenceResults/Dymola/Buildings_DHC_Plants_Combined_Subsystems_Validation_CoolingTowerGroup.txt
diff --git a/Buildings/Resources/ReferenceResults/Dymola/Buildings_Experimental_DHC_Plants_Combined_Subsystems_Validation_HeatPumpGroup.txt b/Buildings/Resources/ReferenceResults/Dymola/Buildings_DHC_Plants_Combined_Subsystems_Validation_HeatPumpGroup.txt
similarity index 100%
rename from Buildings/Resources/ReferenceResults/Dymola/Buildings_Experimental_DHC_Plants_Combined_Subsystems_Validation_HeatPumpGroup.txt
rename to Buildings/Resources/ReferenceResults/Dymola/Buildings_DHC_Plants_Combined_Subsystems_Validation_HeatPumpGroup.txt
diff --git a/Buildings/Resources/ReferenceResults/Dymola/Buildings_Experimental_DHC_Plants_Combined_Subsystems_Validation_MultiplePumpsDp.txt b/Buildings/Resources/ReferenceResults/Dymola/Buildings_DHC_Plants_Combined_Subsystems_Validation_MultiplePumpsDp.txt
similarity index 100%
rename from Buildings/Resources/ReferenceResults/Dymola/Buildings_Experimental_DHC_Plants_Combined_Subsystems_Validation_MultiplePumpsDp.txt
rename to Buildings/Resources/ReferenceResults/Dymola/Buildings_DHC_Plants_Combined_Subsystems_Validation_MultiplePumpsDp.txt
diff --git a/Buildings/Resources/ReferenceResults/Dymola/Buildings_Experimental_DHC_Plants_Combined_Subsystems_Validation_MultiplePumpsFlow.txt b/Buildings/Resources/ReferenceResults/Dymola/Buildings_DHC_Plants_Combined_Subsystems_Validation_MultiplePumpsFlow.txt
similarity index 100%
rename from Buildings/Resources/ReferenceResults/Dymola/Buildings_Experimental_DHC_Plants_Combined_Subsystems_Validation_MultiplePumpsFlow.txt
rename to Buildings/Resources/ReferenceResults/Dymola/Buildings_DHC_Plants_Combined_Subsystems_Validation_MultiplePumpsFlow.txt
diff --git a/Buildings/Resources/ReferenceResults/Dymola/Buildings_Experimental_DHC_Plants_Combined_Subsystems_Validation_MultiplePumpsSpeed.txt b/Buildings/Resources/ReferenceResults/Dymola/Buildings_DHC_Plants_Combined_Subsystems_Validation_MultiplePumpsSpeed.txt
similarity index 100%
rename from Buildings/Resources/ReferenceResults/Dymola/Buildings_Experimental_DHC_Plants_Combined_Subsystems_Validation_MultiplePumpsSpeed.txt
rename to Buildings/Resources/ReferenceResults/Dymola/Buildings_DHC_Plants_Combined_Subsystems_Validation_MultiplePumpsSpeed.txt
diff --git a/Buildings/Resources/ReferenceResults/Dymola/Buildings_Experimental_DHC_Plants_Combined_Subsystems_Validation_ValveOpeningFlowBalancing.txt b/Buildings/Resources/ReferenceResults/Dymola/Buildings_DHC_Plants_Combined_Subsystems_Validation_ValveOpeningFlowBalancing.txt
similarity index 100%
rename from Buildings/Resources/ReferenceResults/Dymola/Buildings_Experimental_DHC_Plants_Combined_Subsystems_Validation_ValveOpeningFlowBalancing.txt
rename to Buildings/Resources/ReferenceResults/Dymola/Buildings_DHC_Plants_Combined_Subsystems_Validation_ValveOpeningFlowBalancing.txt
diff --git a/Buildings/Resources/ReferenceResults/Dymola/Buildings_Experimental_DHC_Plants_Combined_Validation_AllElectricCWStorage.txt b/Buildings/Resources/ReferenceResults/Dymola/Buildings_DHC_Plants_Combined_Validation_AllElectricCWStorage.txt
similarity index 100%
rename from Buildings/Resources/ReferenceResults/Dymola/Buildings_Experimental_DHC_Plants_Combined_Validation_AllElectricCWStorage.txt
rename to Buildings/Resources/ReferenceResults/Dymola/Buildings_DHC_Plants_Combined_Validation_AllElectricCWStorage.txt
diff --git a/Buildings/Resources/ReferenceResults/Dymola/Buildings_Experimental_DHC_Plants_Cooling_BaseClasses_Validation_IdealUser.txt b/Buildings/Resources/ReferenceResults/Dymola/Buildings_DHC_Plants_Cooling_BaseClasses_Validation_IdealUser.txt
similarity index 100%
rename from Buildings/Resources/ReferenceResults/Dymola/Buildings_Experimental_DHC_Plants_Cooling_BaseClasses_Validation_IdealUser.txt
rename to Buildings/Resources/ReferenceResults/Dymola/Buildings_DHC_Plants_Cooling_BaseClasses_Validation_IdealUser.txt
diff --git a/Buildings/Resources/ReferenceResults/Dymola/Buildings_Experimental_DHC_Plants_Cooling_Controls_Validation_ChilledWaterBypass.txt b/Buildings/Resources/ReferenceResults/Dymola/Buildings_DHC_Plants_Cooling_Controls_Validation_ChilledWaterBypass.txt
similarity index 100%
rename from Buildings/Resources/ReferenceResults/Dymola/Buildings_Experimental_DHC_Plants_Cooling_Controls_Validation_ChilledWaterBypass.txt
rename to Buildings/Resources/ReferenceResults/Dymola/Buildings_DHC_Plants_Cooling_Controls_Validation_ChilledWaterBypass.txt
diff --git a/Buildings/Resources/ReferenceResults/Dymola/Buildings_Experimental_DHC_Plants_Cooling_Controls_Validation_ChilledWaterPumpSpeed.txt b/Buildings/Resources/ReferenceResults/Dymola/Buildings_DHC_Plants_Cooling_Controls_Validation_ChilledWaterPumpSpeed.txt
similarity index 100%
rename from Buildings/Resources/ReferenceResults/Dymola/Buildings_Experimental_DHC_Plants_Cooling_Controls_Validation_ChilledWaterPumpSpeed.txt
rename to Buildings/Resources/ReferenceResults/Dymola/Buildings_DHC_Plants_Cooling_Controls_Validation_ChilledWaterPumpSpeed.txt
diff --git a/Buildings/Resources/ReferenceResults/Dymola/Buildings_Experimental_DHC_Plants_Cooling_Controls_Validation_ChillerStage.txt b/Buildings/Resources/ReferenceResults/Dymola/Buildings_DHC_Plants_Cooling_Controls_Validation_ChillerStage.txt
similarity index 100%
rename from Buildings/Resources/ReferenceResults/Dymola/Buildings_Experimental_DHC_Plants_Cooling_Controls_Validation_ChillerStage.txt
rename to Buildings/Resources/ReferenceResults/Dymola/Buildings_DHC_Plants_Cooling_Controls_Validation_ChillerStage.txt
diff --git a/Buildings/Resources/ReferenceResults/Dymola/Buildings_Experimental_DHC_Plants_Cooling_Controls_Validation_TankStatus.txt b/Buildings/Resources/ReferenceResults/Dymola/Buildings_DHC_Plants_Cooling_Controls_Validation_TankStatus.txt
similarity index 100%
rename from Buildings/Resources/ReferenceResults/Dymola/Buildings_Experimental_DHC_Plants_Cooling_Controls_Validation_TankStatus.txt
rename to Buildings/Resources/ReferenceResults/Dymola/Buildings_DHC_Plants_Cooling_Controls_Validation_TankStatus.txt
diff --git a/Buildings/Resources/ReferenceResults/Dymola/Buildings_Experimental_DHC_Plants_Cooling_Examples_ElectricChillerParallel.txt b/Buildings/Resources/ReferenceResults/Dymola/Buildings_DHC_Plants_Cooling_Examples_ElectricChillerParallel.txt
similarity index 100%
rename from Buildings/Resources/ReferenceResults/Dymola/Buildings_Experimental_DHC_Plants_Cooling_Examples_ElectricChillerParallel.txt
rename to Buildings/Resources/ReferenceResults/Dymola/Buildings_DHC_Plants_Cooling_Examples_ElectricChillerParallel.txt
diff --git a/Buildings/Resources/ReferenceResults/Dymola/Buildings_Experimental_DHC_Plants_Cooling_Examples_StoragePlantDualSource.txt b/Buildings/Resources/ReferenceResults/Dymola/Buildings_DHC_Plants_Cooling_Examples_StoragePlantDualSource.txt
similarity index 100%
rename from Buildings/Resources/ReferenceResults/Dymola/Buildings_Experimental_DHC_Plants_Cooling_Examples_StoragePlantDualSource.txt
rename to Buildings/Resources/ReferenceResults/Dymola/Buildings_DHC_Plants_Cooling_Examples_StoragePlantDualSource.txt
diff --git a/Buildings/Resources/ReferenceResults/Dymola/Buildings_Experimental_DHC_Plants_Cooling_Subsystems_Examples_CoolingTowersParallel.txt b/Buildings/Resources/ReferenceResults/Dymola/Buildings_DHC_Plants_Cooling_Subsystems_Examples_CoolingTowersParallel.txt
similarity index 100%
rename from Buildings/Resources/ReferenceResults/Dymola/Buildings_Experimental_DHC_Plants_Cooling_Subsystems_Examples_CoolingTowersParallel.txt
rename to Buildings/Resources/ReferenceResults/Dymola/Buildings_DHC_Plants_Cooling_Subsystems_Examples_CoolingTowersParallel.txt
diff --git a/Buildings/Resources/ReferenceResults/Dymola/Buildings_Experimental_DHC_Plants_Cooling_Subsystems_Examples_CoolingTowersWithBypass.txt b/Buildings/Resources/ReferenceResults/Dymola/Buildings_DHC_Plants_Cooling_Subsystems_Examples_CoolingTowersWithBypass.txt
similarity index 100%
rename from Buildings/Resources/ReferenceResults/Dymola/Buildings_Experimental_DHC_Plants_Cooling_Subsystems_Examples_CoolingTowersWithBypass.txt
rename to Buildings/Resources/ReferenceResults/Dymola/Buildings_DHC_Plants_Cooling_Subsystems_Examples_CoolingTowersWithBypass.txt
diff --git a/Buildings/Resources/ReferenceResults/Dymola/Buildings_Experimental_DHC_Plants_Steam_BaseClasses_Examples_BoilerPolynomial.txt b/Buildings/Resources/ReferenceResults/Dymola/Buildings_DHC_Plants_Steam_BaseClasses_Examples_BoilerPolynomial.txt
similarity index 100%
rename from Buildings/Resources/ReferenceResults/Dymola/Buildings_Experimental_DHC_Plants_Steam_BaseClasses_Examples_BoilerPolynomial.txt
rename to Buildings/Resources/ReferenceResults/Dymola/Buildings_DHC_Plants_Steam_BaseClasses_Examples_BoilerPolynomial.txt
diff --git a/Buildings/Resources/ReferenceResults/Dymola/Buildings_Experimental_DHC_Plants_Steam_BaseClasses_Examples_ControlVolumeEvaporation.txt b/Buildings/Resources/ReferenceResults/Dymola/Buildings_DHC_Plants_Steam_BaseClasses_Examples_ControlVolumeEvaporation.txt
similarity index 100%
rename from Buildings/Resources/ReferenceResults/Dymola/Buildings_Experimental_DHC_Plants_Steam_BaseClasses_Examples_ControlVolumeEvaporation.txt
rename to Buildings/Resources/ReferenceResults/Dymola/Buildings_DHC_Plants_Steam_BaseClasses_Examples_ControlVolumeEvaporation.txt
diff --git a/Buildings/Resources/ReferenceResults/Dymola/Buildings_Experimental_DHC_Plants_Steam_Examples_SingleBoiler.txt b/Buildings/Resources/ReferenceResults/Dymola/Buildings_DHC_Plants_Steam_Examples_SingleBoiler.txt
similarity index 100%
rename from Buildings/Resources/ReferenceResults/Dymola/Buildings_Experimental_DHC_Plants_Steam_Examples_SingleBoiler.txt
rename to Buildings/Resources/ReferenceResults/Dymola/Buildings_DHC_Plants_Steam_Examples_SingleBoiler.txt
diff --git a/Buildings/Resources/ReferenceResults/Dymola/Buildings_Experimental_DHC_Loads_HotWater_Examples_HeaterAndFixtureHeatPumpWithTank.txt b/Buildings/Resources/ReferenceResults/Dymola/Buildings_Experimental_DHC_Loads_HotWater_Examples_HeaterAndFixtureHeatPumpWithTank.txt
deleted file mode 100644
index 5ba3b6882e3..00000000000
--- a/Buildings/Resources/ReferenceResults/Dymola/Buildings_Experimental_DHC_Loads_HotWater_Examples_HeaterAndFixtureHeatPumpWithTank.txt
+++ /dev/null
@@ -1,15 +0,0 @@
-last-generated=2023-10-02
-statistics-simulation=
-{
-  "linear": "0",
-  "nonlinear": "12, 1",
-  "number of continuous time states": "10",
-  "numerical Jacobians": "0"
-}
-time=[0e+00, 8.64e+04]
-theMixVal.TMixSet=[3.161499938964844e+02, 3.161499938964844e+02]
-theMixVal.senTemHot.T=[3.031499938964844e+02, 3.236727905273438e+02, 3.246880798339844e+02, 3.247964172363281e+02, 3.248548889160156e+02, 3.248545837402344e+02, 3.248540344238281e+02, 3.248533630371094e+02, 3.248526000976562e+02, 3.24851806640625e+02, 3.248509521484375e+02, 3.248500671386719e+02, 3.248492736816406e+02, 3.248485107421875e+02, 3.248478088378906e+02, 3.248472900390625e+02, 3.248471374511719e+02, 3.248458251953125e+02, 3.248456726074219e+02, 3.248455200195312e+02, 3.248446044921875e+02, 3.248438110351562e+02, 3.248430480957031e+02, 3.2484228515625e+02, 3.248414916992188e+02, 3.248407287597656e+02, 3.248399658203125e+02, 3.248392028808594e+02, 3.248384094238281e+02, 3.245873107910156e+02, 3.251229858398438e+02, 3.247785949707031e+02, 3.211871337890625e+02, 3.245481567382812e+02, 3.246640625e+02, 3.246646423339844e+02, 3.246671142578125e+02, 3.249011840820312e+02, 3.252456665039062e+02, 3.252465209960938e+02, 3.252465209960938e+02, 3.252787170410156e+02, 3.252789306640625e+02, 3.252781066894531e+02, 3.252774047851562e+02, 3.252765502929688e+02, 3.252753601074219e+02, 3.252742614746094e+02, 3.252737121582031e+02, 3.252734985351562e+02, 3.252732543945312e+02, 3.252725524902344e+02, 3.252713317871094e+02, 3.252803649902344e+02, 3.252812805175781e+02, 3.252803344726562e+02, 3.254154663085938e+02, 3.254839477539062e+02, 3.255443725585938e+02, 3.256122741699219e+02, 3.256281127929688e+02, 3.256282348632812e+02, 3.256278076171875e+02, 3.25626953125e+02, 3.256283874511719e+02, 3.256276550292969e+02, 3.256275634765625e+02, 3.256256408691406e+02, 3.256336669921875e+02, 3.256452331542969e+02, 3.256450500488281e+02, 3.256456298828125e+02, 3.256458129882812e+02, 3.256448364257812e+02, 3.256440734863281e+02, 3.256449584960938e+02, 3.256458435058594e+02, 3.256450805664062e+02, 3.256442565917969e+02, 3.256433715820312e+02, 3.256425170898438e+02, 3.2564404296875e+02, 3.256431579589844e+02, 3.256421508789062e+02, 3.256418762207031e+02, 3.256454772949219e+02, 3.256451416015625e+02, 3.256444091796875e+02, 3.25645751953125e+02, 3.256473999023438e+02, 3.256669006347656e+02, 3.256665649414062e+02, 3.256666870117188e+02, 3.256661987304688e+02, 3.2566552734375e+02, 3.256730651855469e+02, 3.256736755371094e+02, 3.256734924316406e+02, 3.256729736328125e+02, 3.2567236328125e+02, 3.256716918945312e+02]
-gen.THotSouSet=[3.231499938964844e+02, 3.231499938964844e+02]
-gen.senTemHot.T=[2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 3.246973876953125e+02, 3.246973876953125e+02, 3.246973876953125e+02, 3.246973876953125e+02, 3.246973876953125e+02, 3.246973876953125e+02, 3.246973876953125e+02, 3.246973876953125e+02, 3.246973876953125e+02, 3.246973876953125e+02, 3.246973876953125e+02, 3.246973876953125e+02, 3.246973876953125e+02, 3.246973876953125e+02, 3.246973876953125e+02, 3.246973876953125e+02, 3.246973876953125e+02, 3.246973876953125e+02, 3.246973876953125e+02, 3.246973876953125e+02, 3.246973876953125e+02, 3.246973876953125e+02, 3.246973876953125e+02, 3.246973876953125e+02, 3.246973876953125e+02, 3.246973876953125e+02, 3.245881652832031e+02, 3.245881652832031e+02, 3.247797546386719e+02, 3.211875915527344e+02, 3.209213256835938e+02, 3.246578369140625e+02, 3.246578369140625e+02, 3.24665771484375e+02, 3.246604309082031e+02, 3.246604309082031e+02, 3.25246337890625e+02, 3.252465209960938e+02, 3.252489013671875e+02, 3.252489013671875e+02, 3.252489013671875e+02, 3.252489013671875e+02, 3.252489013671875e+02, 3.252489013671875e+02, 3.252489013671875e+02, 3.252489013671875e+02, 3.252489013671875e+02, 3.252489013671875e+02, 3.252489013671875e+02, 3.252489013671875e+02, 3.252708435058594e+02, 3.252708435058594e+02, 3.252708435058594e+02, 3.252839050292969e+02, 3.254830322265625e+02, 3.255290222167969e+02, 3.256122741699219e+02, 3.256122741699219e+02, 3.256122741699219e+02, 3.256122741699219e+02, 3.256122741699219e+02, 3.256272583007812e+02, 3.256272583007812e+02, 3.256272583007812e+02, 3.256269836425781e+02, 3.256269836425781e+02, 3.256269836425781e+02, 3.256269836425781e+02, 3.256455383300781e+02, 3.256455383300781e+02, 3.256455383300781e+02, 3.256441650390625e+02, 3.256446228027344e+02, 3.256446228027344e+02, 3.256446228027344e+02, 3.256446228027344e+02, 3.256446228027344e+02, 3.256446228027344e+02, 3.25642822265625e+02, 3.25642822265625e+02, 3.25642822265625e+02, 3.256416625976562e+02, 3.256416625976562e+02, 3.256416625976562e+02, 3.256416625976562e+02, 3.256444396972656e+02, 3.256471862792969e+02, 3.256471862792969e+02, 3.256471862792969e+02, 3.256664733886719e+02, 3.256664733886719e+02, 3.256664733886719e+02, 3.256662902832031e+02, 3.256662902832031e+02, 3.256662902832031e+02, 3.256662902832031e+02, 3.256675415039062e+02, 3.256675415039062e+02]
-PEle=[0e+00, 3.103510009765625e+03, -2.474682014863561e-09, 1.552031982421875e+03, 1.944002250842125e-11, 6.525877674210716e-15, 4.398963868349865e-18, 5.822399013897955e-18, 1.166643210953663e-17, 7.535764272868342e-18, 3.048205225010985e-17, 1.280367124174266e-18, 4.876936454115463e-17, 7.778041503818183e-17, 5.493829887856266e-17, 1.441374314890109e-18, 2.941320164506453e-21, -2.069310344290054e-25, 3.47378591483109e-23, -5.862849588571114e-23, -1.516877599911051e-23, -4.444972355935876e-25, 2.119356173157099e-25, 4.651089384518482e-25, 5.798669995246776e-26, 2.773663292445859e-26, 1.419189364700414e-25, 2.303862881094121e-26, 1.79945101263654e-25, 1.799028515625e+04, 4.903311037196545e-07, 3.300085546875e+04, 3.797031640625e+04, 7.786015014648438e+02, 2.24342949822921e-24, 4.540659103734817e-27, 1.446257088426935e-14, 4.91940087890625e+03, 2.388467201797084e-09, -1.048304924969661e-19, 4.003404801832859e-24, -6.344259784185624e-09, -8.486267938367931e-11, -3.732601033812344e-12, 7.824397393559925e-15, -4.323622081019163e-15, -7.394011158475742e-18, -4.151236406382457e-19, -3.576587313999392e-19, 1.310295590678498e-21, -4.412296195018552e-22, 9.065118178408998e-25, -5.504339088975896e-25, -1.394590753989178e-07, 7.333907786621907e-12, 3.619727876268521e-14, 1.865833007812413e+03, 3.951241943359298e+03, 1.760168579101562e+03, 5.50609423828125e+03, 2.844893487452538e-10, -1.324992887082694e-15, -1.041487889142246e-16, -1.106379401695934e-19, -1.35629961648066e-33, 1.694392741749711e-35, -1.517650938284789e-38, -4.203895392974451e-45, 4.925972290038855e+02, 3.461111619529183e-09, -4.751995780381609e-13, 1.992293638410931e-26, -1.216045574198428e-37, 5.061490053141239e-42, -0e+00, 2.47825390625e+03, 4.413731460317649e-07, -1.580408894030771e-11, -9.32403026315809e-13, -4.702950810904494e-13, -4.892904454539306e-15, -6.294080521911383e-03, -6.341734914983022e-10, -1.09823597698594e-12, 3.0890517578125e+03, -1.563396301307307e-09, 3.042076356443713e-12, -3.598889679920069e-15, 2.57208663970232e-03, 3.070844482421875e+03, -1.19578036361645e-08, 8.093549268284317e-12, 1.515148180148535e-24, 1.933614212272346e-27, 7.909292576847865e-28, 4.711140366708833e-10, 1.873377321326419e-11, -8.758369463707227e-14, -4.846384134526678e-15, -5.924123254978888e-23, 6.194876293692222e-30]
-theMixVal.yMixSet=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 4.471937119960785e-01, 4.471937119960785e-01, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 2.733856439590454e-01, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 2.5729418595688e-14, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00]
diff --git a/Buildings/Resources/ReferenceResults/Dymola/Buildings_Experimental_DHC_Networks_Combined_BaseClasses_Validation_Pipe.txt b/Buildings/Resources/ReferenceResults/Dymola/Buildings_Experimental_DHC_Networks_Combined_BaseClasses_Validation_Pipe.txt
deleted file mode 100644
index 6f3ed705dff..00000000000
--- a/Buildings/Resources/ReferenceResults/Dymola/Buildings_Experimental_DHC_Networks_Combined_BaseClasses_Validation_Pipe.txt
+++ /dev/null
@@ -1,21 +0,0 @@
-last-generated=2022-11-18
-statistics-initialization=
-{
-  "nonlinear": "0, 1, 0, 1",
-  "numerical Jacobians": "0"
-}
-statistics-simulation=
-{
-  "linear": " ",
-  "nonlinear": " ",
-  "numerical Jacobians": "0"
-}
-time=[0e+00, 1e+00]
-pipSta1.dh=[5.47999981790781e-03, 5.47999981790781e-03]
-pipAut1.dh=[5.476676858961582e-03, 5.476676858961582e-03]
-pipSta2.dh=[2.943000078201294e+00, 2.943000078201294e+00]
-pipAut2.dh=[2.94313907623291e+00, 2.94313907623291e+00]
-pipSta1.dp=[1.053362734375e+05, 1.053362734375e+05]
-pipAut1.dp=[1.05657125e+05, 1.05657125e+05]
-pipSta2.dp=[1.000228691101074e+01, 1.000228691101074e+01]
-pipAut2.dp=[1e+01, 1e+01]
diff --git a/Buildings/Resources/Scripts/BuildingsPy/conf.yml b/Buildings/Resources/Scripts/BuildingsPy/conf.yml
index f779685428d..d14e0263f2f 100644
--- a/Buildings/Resources/Scripts/BuildingsPy/conf.yml
+++ b/Buildings/Resources/Scripts/BuildingsPy/conf.yml
@@ -30,6 +30,82 @@
   openmodelica:
     comment: 'TimeoutExpired: omc timed out after 300 seconds'
     time_out: 600
+- model_name: Buildings.DHC.ETS.Combined.Validation.ChillerBorefield
+  openmodelica:
+    comment: Timeout on travis after 900 seconds, https://app.travis-ci.com/github/lbl-srg/modelica-buildings/jobs/615261271
+    simulate: false
+- model_name: Buildings.DHC.ETS.Cooling.Examples.Indirect
+  openmodelica:
+    comment: simulation terminated by an assertion at initialization.
+    simulate: false
+- model_name: Buildings.DHC.Examples.Combined.SeriesConstantFlow
+  openmodelica:
+    comment: simulation terminated by an assertion at initialization
+    simulate: false
+- model_name: Buildings.DHC.Examples.Combined.SeriesVariableFlow
+  openmodelica:
+    comment: simulation terminated by an assertion at initialization
+    simulate: false
+- model_name: Buildings.DHC.Examples.Combined.SeriesVariableFlowAgentControl
+  openmodelica:
+    comment: simulation terminated by an assertion at initialization
+    simulate: false
+  optimica:
+    comment: FMUException Failed to update the events at time 0.000000E+00.
+    simulate: false
+- model_name: Buildings.DHC.Examples.Cooling.ElectricChillersDirectETS
+  openmodelica:
+    comment: simulation terminated by an assertion at initialization
+    simulate: false
+  optimica:
+    comment: 'The system is structurally singular. Modelon #2023012739000252'
+    translate: false
+- model_name: Buildings.DHC.Loads.BaseClasses.Examples.CouplingTimeSeries
+  openmodelica:
+    comment: 'simulation terminated by an assertion at initialization, Invalid root: (0)^(-1.5), corrected in OMC 1.23.0~dev-206-g00d3636'
+    simulate: false
+- model_name: Buildings.DHC.Loads.BaseClasses.Examples.CouplingTimeSeriesSingleLoop
+  openmodelica:
+    comment: simulation terminated by an assertion at initialization
+    simulate: false
+- model_name: Buildings.DHC.Loads.Combined.Examples.BuildingTimeSeriesWithETS
+  openmodelica:
+    comment: simulation terminated by an assertion at initialization
+    simulate: false
+- model_name: Buildings.DHC.Loads.Combined.Examples.BuildingTimeSeriesWithETSDHWTank
+  openmodelica:
+    comment: simulation terminated by an assertion at initialization [works ok in Ubuntu 20 with OM 1.22.0]
+    simulate: false
+- model_name: Buildings.DHC.Loads.Cooling.Examples.BuildingTimeSeriesWithETS
+  openmodelica:
+    comment: simulation terminated by an assertion at initialization
+    simulate: false
+- model_name: Buildings.DHC.Plants.Combined.Controls.BaseClasses.Validation.StagingPlant
+  openmodelica:
+    comment: Internal error BackendDAETransform.analyseStrongComponentBlock failed (Purely discrete algebraic loops cannot be solved by iterative processes. Try to break them open using the delay() operator.)
+    translate: false
+- model_name: Buildings.DHC.Plants.Combined.Examples.AllElectricCWStorage
+  dymola:
+    time_out: 600
+  openmodelica:
+    comment: Internal error NFCeval.evalBinaryMul failed to evaluate {0.0, 0.03359309597916374, 0.06718619195832748, 0.09151222697772191}[pressure.n] * 0.0
+    translate: false
+  optimica:
+    time_out: 600
+- model_name: Buildings.DHC.Plants.Combined.Validation.AllElectricCWStorage
+  openmodelica:
+    comment: Internal error NFCeval.evalBinaryMul failed to evaluate {0.0, 0.03359309597916374, 0.06718619195832748, 0.09151222697772191}[pressure.n] * 0.0
+    translate: false
+  optimica:
+    time_out: 600
+- model_name: Buildings.DHC.Plants.Cooling.Examples.StoragePlantDualSource
+  openmodelica:
+    comment: 'Could not evaluate structural parameter (or constant): mChi_flow_nominal'
+    translate: false
+- model_name: Buildings.DHC.Plants.Steam.BaseClasses.Examples.ControlVolumeEvaporation
+  openmodelica:
+    comment: simulation terminated by an assertion at initialization
+    simulate: false
 - model_name: Buildings.Electrical.AC.ThreePhasesUnbalanced.Validation.IEEETests.Test4NodesFeeder.BalancedStepDown.DD
   openmodelica:
     comment: simulation terminated by an assertion at initialization.
@@ -95,82 +171,6 @@
   optimica:
     comment: timeout on travis after 300s, https://app.travis-ci.com/github/lbl-srg/modelica-buildings/jobs/618700275
     time_out: 600
-- model_name: Buildings.Experimental.DHC.EnergyTransferStations.Combined.Validation.ChillerBorefield
-  openmodelica:
-    comment: Timeout on travis after 900 seconds, https://app.travis-ci.com/github/lbl-srg/modelica-buildings/jobs/615261271
-    simulate: false
-- model_name: Buildings.Experimental.DHC.EnergyTransferStations.Cooling.Examples.Indirect
-  openmodelica:
-    comment: simulation terminated by an assertion at initialization.
-    simulate: false
-- model_name: Buildings.Experimental.DHC.Examples.Combined.SeriesConstantFlow
-  openmodelica:
-    comment: simulation terminated by an assertion at initialization
-    simulate: false
-- model_name: Buildings.Experimental.DHC.Examples.Combined.SeriesVariableFlow
-  openmodelica:
-    comment: simulation terminated by an assertion at initialization
-    simulate: false
-- model_name: Buildings.Experimental.DHC.Examples.Combined.SeriesVariableFlowAgentControl
-  openmodelica:
-    comment: simulation terminated by an assertion at initialization
-    simulate: false
-  optimica:
-    comment: FMUException Failed to update the events at time 0.000000E+00.
-    simulate: false
-- model_name: Buildings.Experimental.DHC.Examples.Cooling.ElectricChillersDirectETS
-  openmodelica:
-    comment: simulation terminated by an assertion at initialization
-    simulate: false
-  optimica:
-    comment: 'The system is structurally singular. Modelon #2023012739000252'
-    translate: false
-- model_name: Buildings.Experimental.DHC.Loads.BaseClasses.Examples.CouplingTimeSeries
-  openmodelica:
-    comment: 'simulation terminated by an assertion at initialization, Invalid root: (0)^(-1.5), corrected in OMC 1.23.0~dev-206-g00d3636'
-    simulate: false
-- model_name: Buildings.Experimental.DHC.Loads.BaseClasses.Examples.CouplingTimeSeriesSingleLoop
-  openmodelica:
-    comment: simulation terminated by an assertion at initialization
-    simulate: false
-- model_name: Buildings.Experimental.DHC.Loads.Combined.Examples.BuildingTimeSeriesWithETS
-  openmodelica:
-    comment: simulation terminated by an assertion at initialization
-    simulate: false
-- model_name: Buildings.Experimental.DHC.Loads.Combined.Examples.BuildingTimeSeriesWithETSDHWTank
-  openmodelica:
-    comment: simulation terminated by an assertion at initialization [works ok in Ubuntu 20 with OM 1.22.0]
-    simulate: false
-- model_name: Buildings.Experimental.DHC.Loads.Cooling.Examples.BuildingTimeSeriesWithETS
-  openmodelica:
-    comment: simulation terminated by an assertion at initialization
-    simulate: false
-- model_name: Buildings.Experimental.DHC.Plants.Combined.Controls.BaseClasses.Validation.StagingPlant
-  openmodelica:
-    comment: Internal error BackendDAETransform.analyseStrongComponentBlock failed (Purely discrete algebraic loops cannot be solved by iterative processes. Try to break them open using the delay() operator.)
-    translate: false
-- model_name: Buildings.Experimental.DHC.Plants.Combined.Examples.AllElectricCWStorage
-  dymola:
-    time_out: 600
-  openmodelica:
-    comment: Internal error NFCeval.evalBinaryMul failed to evaluate {0.0, 0.03359309597916374, 0.06718619195832748, 0.09151222697772191}[pressure.n] * 0.0
-    translate: false
-  optimica:
-    time_out: 600
-- model_name: Buildings.Experimental.DHC.Plants.Combined.Validation.AllElectricCWStorage
-  openmodelica:
-    comment: Internal error NFCeval.evalBinaryMul failed to evaluate {0.0, 0.03359309597916374, 0.06718619195832748, 0.09151222697772191}[pressure.n] * 0.0
-    translate: false
-  optimica:
-    time_out: 600
-- model_name: Buildings.Experimental.DHC.Plants.Cooling.Examples.StoragePlantDualSource
-  openmodelica:
-    comment: 'Could not evaluate structural parameter (or constant): mChi_flow_nominal'
-    translate: false
-- model_name: Buildings.Experimental.DHC.Plants.Steam.BaseClasses.Examples.ControlVolumeEvaporation
-  openmodelica:
-    comment: simulation terminated by an assertion at initialization
-    simulate: false
 - model_name: Buildings.Fluid.Examples.FlowSystem.Basic
   openmodelica:
     comment: '''omc'' caused ''simulation terminated by an assertion at initialization''.'
diff --git a/Buildings/Resources/Scripts/Conversion/ConvertBuildings_from_10_to_11.0.0.mos b/Buildings/Resources/Scripts/Conversion/ConvertBuildings_from_10_to_11.0.0.mos
index 97f5c78ac3f..2f84bbf9c00 100644
--- a/Buildings/Resources/Scripts/Conversion/ConvertBuildings_from_10_to_11.0.0.mos
+++ b/Buildings/Resources/Scripts/Conversion/ConvertBuildings_from_10_to_11.0.0.mos
@@ -50,9 +50,8 @@ convertClass("Buildings.Controls.OBC.CDL.Logical.ZeroCrossing",
 convertClass("Buildings.Controls.OBC.CDL.Reals.Sources.ModelTime",
              "Buildings.Controls.OBC.CDL.Reals.Sources.CivilTime");
 
-// Conversion for https://github.com/lbl-srg/modelica-buildings/issues/xxxx
-convertClass("Buildings.Experimental.DHC.Plants.Reservoir.Borefield",
-             "Buildings.Experimental.DHC.Examples.Combined.BaseClasses.BoreField");
+convertClass("Buildings.Experimental.DHC.Plants.Reservoir.BoreField",
+             "Buildings.DHC.ETS.Combined.Subsystems.Borefield");
 
 // Conversion for https://github.com/lbl-srg/modelica-buildings/issues/3431
 convertClass("Buildings.Fluid.Geothermal.BuriedPipes","Buildings.Fluid.FixedResistances.BuriedPipes");
@@ -61,4 +60,15 @@ convertClass("Buildings.Fluid.Geothermal.BuriedPipes","Buildings.Fluid.FixedResi
 convertClass("Buildings.Airflow.Multizone.BaseClasses.interpolate",
              "Buildings.Utilities.Math.Functions.interpolate");
 convertClass("Buildings.Airflow.Multizone.BaseClasses.Examples.Interpolate",
-             "Buildings.Utilities.Math.Functions.Examples.Interpolate");
\ No newline at end of file
+             "Buildings.Utilities.Math.Functions.Examples.Interpolate");
+
+// Conversion for https://github.com/lbl-srg/modelica-buildings/issues/3694
+convertClass("Buildings.Experimental.DHC.Networks.Distribution2PipePlugFlow", "Buildings.DHC.Networks.Distribution2PipePlugFlow_v");
+convertClass("Buildings.Experimental.DHC.Networks.Connection2PipePlugFlow", "Buildings.DHC.Networks.Connections.Connection2PipePlugFlow_v");
+convertClass("Buildings.Experimental.DHC.Networks.Controls.MainPump", "Buildings.DHC.Networks.Controls.MainPump1Pipe");
+convertClass("Buildings.Experimental.DHC.Networks.Combined.BaseClasses.PipeAutosize", "Buildings.DHC.Networks.Pipes.PipeAutosize");
+convertClass("Buildings.Experimental.DHC.Networks.Combined.BaseClasses.PipeStandard", "Buildings.DHC.Networks.Pipes.PipeStandard");
+
+// Conversion for https://github.com/lbl-srg/modelica-buildings/issues/3727
+convertClass("Buildings.Experimental.DHC", "Buildings.DHC");
+convertClass("Buildings.Experimental.DHC.EnergyTransferStations", "Buildings.DHC.ETS");
\ No newline at end of file
diff --git a/Buildings/Resources/Scripts/Dymola/Experimental/DHC/EnergyTransferStations/BaseClasses/Validation/CollectorDistributor.mos b/Buildings/Resources/Scripts/Dymola/DHC/ETS/BaseClasses/Validation/CollectorDistributor.mos
similarity index 91%
rename from Buildings/Resources/Scripts/Dymola/Experimental/DHC/EnergyTransferStations/BaseClasses/Validation/CollectorDistributor.mos
rename to Buildings/Resources/Scripts/Dymola/DHC/ETS/BaseClasses/Validation/CollectorDistributor.mos
index d9196c64735..2866c6ee688 100644
--- a/Buildings/Resources/Scripts/Dymola/Experimental/DHC/EnergyTransferStations/BaseClasses/Validation/CollectorDistributor.mos
+++ b/Buildings/Resources/Scripts/Dymola/DHC/ETS/BaseClasses/Validation/CollectorDistributor.mos
@@ -1,4 +1,4 @@
-simulateModel("Buildings.Experimental.DHC.EnergyTransferStations.BaseClasses.Validation.CollectorDistributor",
+simulateModel("Buildings.DHC.ETS.BaseClasses.Validation.CollectorDistributor",
     method="cvode",
     tolerance=1e-6,
     stopTime=5000,
diff --git a/Buildings/Resources/Scripts/Dymola/Experimental/DHC/EnergyTransferStations/Combined/Examples/ChillerBorefield.mos b/Buildings/Resources/Scripts/Dymola/DHC/ETS/Combined/Examples/ChillerBorefield.mos
similarity index 96%
rename from Buildings/Resources/Scripts/Dymola/Experimental/DHC/EnergyTransferStations/Combined/Examples/ChillerBorefield.mos
rename to Buildings/Resources/Scripts/Dymola/DHC/ETS/Combined/Examples/ChillerBorefield.mos
index d77507dfd9c..a558be90d41 100644
--- a/Buildings/Resources/Scripts/Dymola/Experimental/DHC/EnergyTransferStations/Combined/Examples/ChillerBorefield.mos
+++ b/Buildings/Resources/Scripts/Dymola/DHC/ETS/Combined/Examples/ChillerBorefield.mos
@@ -1,4 +1,4 @@
-simulateModel("Buildings.Experimental.DHC.EnergyTransferStations.Combined.Examples.ChillerBorefield",
+simulateModel("Buildings.DHC.ETS.Combined.Examples.ChillerBorefield",
     method="Cvode",
     tolerance=1e-6,
     startTime=6.5E6,
diff --git a/Buildings/Resources/Scripts/Dymola/Experimental/DHC/EnergyTransferStations/Combined/Examples/ChillerOnly.mos b/Buildings/Resources/Scripts/Dymola/DHC/ETS/Combined/Examples/ChillerOnly.mos
similarity index 96%
rename from Buildings/Resources/Scripts/Dymola/Experimental/DHC/EnergyTransferStations/Combined/Examples/ChillerOnly.mos
rename to Buildings/Resources/Scripts/Dymola/DHC/ETS/Combined/Examples/ChillerOnly.mos
index c98c9e466a3..77e4a9be157 100644
--- a/Buildings/Resources/Scripts/Dymola/Experimental/DHC/EnergyTransferStations/Combined/Examples/ChillerOnly.mos
+++ b/Buildings/Resources/Scripts/Dymola/DHC/ETS/Combined/Examples/ChillerOnly.mos
@@ -1,4 +1,4 @@
-simulateModel("Buildings.Experimental.DHC.EnergyTransferStations.Combined.Examples.ChillerOnly",
+simulateModel("Buildings.DHC.ETS.Combined.Examples.ChillerOnly",
     method="Cvode",
     tolerance=1e-6,
     startTime=6.5E6,
diff --git a/Buildings/Resources/Scripts/Dymola/Experimental/DHC/EnergyTransferStations/Combined/Subsystems/Validation/Borefield.mos b/Buildings/Resources/Scripts/Dymola/DHC/ETS/Combined/Subsystems/Validation/Borefield.mos
similarity index 82%
rename from Buildings/Resources/Scripts/Dymola/Experimental/DHC/EnergyTransferStations/Combined/Subsystems/Validation/Borefield.mos
rename to Buildings/Resources/Scripts/Dymola/DHC/ETS/Combined/Subsystems/Validation/Borefield.mos
index 5bcc0524196..7ad018c7d11 100644
--- a/Buildings/Resources/Scripts/Dymola/Experimental/DHC/EnergyTransferStations/Combined/Subsystems/Validation/Borefield.mos
+++ b/Buildings/Resources/Scripts/Dymola/DHC/ETS/Combined/Subsystems/Validation/Borefield.mos
@@ -1,4 +1,4 @@
-simulateModel("Buildings.Experimental.DHC.EnergyTransferStations.Combined.Subsystems.Validation.Borefield",
+simulateModel("Buildings.DHC.ETS.Combined.Subsystems.Validation.Borefield",
     method="Cvode",
     tolerance=1e-6,
     stopTime=20000,
diff --git a/Buildings/Resources/Scripts/Dymola/Experimental/DHC/EnergyTransferStations/Combined/Subsystems/Validation/Chiller.mos b/Buildings/Resources/Scripts/Dymola/DHC/ETS/Combined/Subsystems/Validation/Chiller.mos
similarity index 91%
rename from Buildings/Resources/Scripts/Dymola/Experimental/DHC/EnergyTransferStations/Combined/Subsystems/Validation/Chiller.mos
rename to Buildings/Resources/Scripts/Dymola/DHC/ETS/Combined/Subsystems/Validation/Chiller.mos
index 5e31bd18e8d..18231c8da37 100644
--- a/Buildings/Resources/Scripts/Dymola/Experimental/DHC/EnergyTransferStations/Combined/Subsystems/Validation/Chiller.mos
+++ b/Buildings/Resources/Scripts/Dymola/DHC/ETS/Combined/Subsystems/Validation/Chiller.mos
@@ -1,4 +1,4 @@
-simulateModel("Buildings.Experimental.DHC.EnergyTransferStations.Combined.Subsystems.Validation.Chiller",
+simulateModel("Buildings.DHC.ETS.Combined.Subsystems.Validation.Chiller",
     method="Cvode",
     tolerance=1e-6,
     stopTime=5000,
diff --git a/Buildings/Resources/Scripts/Dymola/Experimental/DHC/EnergyTransferStations/Combined/Subsystems/Validation/HeatExchanger.mos b/Buildings/Resources/Scripts/Dymola/DHC/ETS/Combined/Subsystems/Validation/HeatExchanger.mos
similarity index 89%
rename from Buildings/Resources/Scripts/Dymola/Experimental/DHC/EnergyTransferStations/Combined/Subsystems/Validation/HeatExchanger.mos
rename to Buildings/Resources/Scripts/Dymola/DHC/ETS/Combined/Subsystems/Validation/HeatExchanger.mos
index 76d2cbce6eb..e5814873737 100644
--- a/Buildings/Resources/Scripts/Dymola/Experimental/DHC/EnergyTransferStations/Combined/Subsystems/Validation/HeatExchanger.mos
+++ b/Buildings/Resources/Scripts/Dymola/DHC/ETS/Combined/Subsystems/Validation/HeatExchanger.mos
@@ -1,4 +1,4 @@
-simulateModel("Buildings.Experimental.DHC.EnergyTransferStations.Combined.Subsystems.Validation.HeatExchanger",
+simulateModel("Buildings.DHC.ETS.Combined.Subsystems.Validation.HeatExchanger",
     method="Cvode",
     tolerance=1e-6,
     stopTime=5000,
diff --git a/Buildings/Resources/Scripts/Dymola/Experimental/DHC/EnergyTransferStations/Combined/Subsystems/Validation/HeatPump.mos b/Buildings/Resources/Scripts/Dymola/DHC/ETS/Combined/Subsystems/Validation/HeatPump.mos
similarity index 90%
rename from Buildings/Resources/Scripts/Dymola/Experimental/DHC/EnergyTransferStations/Combined/Subsystems/Validation/HeatPump.mos
rename to Buildings/Resources/Scripts/Dymola/DHC/ETS/Combined/Subsystems/Validation/HeatPump.mos
index 602db1c60ab..602d1e430c0 100644
--- a/Buildings/Resources/Scripts/Dymola/Experimental/DHC/EnergyTransferStations/Combined/Subsystems/Validation/HeatPump.mos
+++ b/Buildings/Resources/Scripts/Dymola/DHC/ETS/Combined/Subsystems/Validation/HeatPump.mos
@@ -1,4 +1,4 @@
-simulateModel("Buildings.Experimental.DHC.EnergyTransferStations.Combined.Subsystems.Validation.HeatPump",
+simulateModel("Buildings.DHC.ETS.Combined.Subsystems.Validation.HeatPump",
     method="cvode",
     tolerance=1e-6,
     startTime=0,
diff --git a/Buildings/Resources/Scripts/Dymola/Experimental/DHC/EnergyTransferStations/Combined/Subsystems/Validation/HeatPumpDHWTank.mos b/Buildings/Resources/Scripts/Dymola/DHC/ETS/Combined/Subsystems/Validation/HeatPumpDHWTank.mos
similarity index 93%
rename from Buildings/Resources/Scripts/Dymola/Experimental/DHC/EnergyTransferStations/Combined/Subsystems/Validation/HeatPumpDHWTank.mos
rename to Buildings/Resources/Scripts/Dymola/DHC/ETS/Combined/Subsystems/Validation/HeatPumpDHWTank.mos
index d472224865f..54d7d57db44 100644
--- a/Buildings/Resources/Scripts/Dymola/Experimental/DHC/EnergyTransferStations/Combined/Subsystems/Validation/HeatPumpDHWTank.mos
+++ b/Buildings/Resources/Scripts/Dymola/DHC/ETS/Combined/Subsystems/Validation/HeatPumpDHWTank.mos
@@ -1,4 +1,4 @@
-simulateModel("Buildings.Experimental.DHC.EnergyTransferStations.Combined.Subsystems.Validation.HeatPumpDHWTank",
+simulateModel("Buildings.DHC.ETS.Combined.Subsystems.Validation.HeatPumpDHWTank",
     method="cvode",
     tolerance=1e-6,
     startTime=0,
diff --git a/Buildings/Resources/Scripts/Dymola/Experimental/DHC/EnergyTransferStations/Combined/Subsystems/Validation/SwitchBox.mos b/Buildings/Resources/Scripts/Dymola/DHC/ETS/Combined/Subsystems/Validation/SwitchBox.mos
similarity index 83%
rename from Buildings/Resources/Scripts/Dymola/Experimental/DHC/EnergyTransferStations/Combined/Subsystems/Validation/SwitchBox.mos
rename to Buildings/Resources/Scripts/Dymola/DHC/ETS/Combined/Subsystems/Validation/SwitchBox.mos
index 1de81ae637f..451619eee55 100644
--- a/Buildings/Resources/Scripts/Dymola/Experimental/DHC/EnergyTransferStations/Combined/Subsystems/Validation/SwitchBox.mos
+++ b/Buildings/Resources/Scripts/Dymola/DHC/ETS/Combined/Subsystems/Validation/SwitchBox.mos
@@ -1,4 +1,4 @@
-simulateModel("Buildings.Experimental.DHC.EnergyTransferStations.Combined.Subsystems.Validation.SwitchBox",
+simulateModel("Buildings.DHC.ETS.Combined.Subsystems.Validation.SwitchBox",
     method="cvode",
     tolerance=1e-6,
     startTime=0,
diff --git a/Buildings/Resources/Scripts/Dymola/Experimental/DHC/EnergyTransferStations/Combined/Subsystems/Validation/WatersideEconomizer.mos b/Buildings/Resources/Scripts/Dymola/DHC/ETS/Combined/Subsystems/Validation/WatersideEconomizer.mos
similarity index 88%
rename from Buildings/Resources/Scripts/Dymola/Experimental/DHC/EnergyTransferStations/Combined/Subsystems/Validation/WatersideEconomizer.mos
rename to Buildings/Resources/Scripts/Dymola/DHC/ETS/Combined/Subsystems/Validation/WatersideEconomizer.mos
index 1ce5aabd673..ffa4e6cfd76 100644
--- a/Buildings/Resources/Scripts/Dymola/Experimental/DHC/EnergyTransferStations/Combined/Subsystems/Validation/WatersideEconomizer.mos
+++ b/Buildings/Resources/Scripts/Dymola/DHC/ETS/Combined/Subsystems/Validation/WatersideEconomizer.mos
@@ -1,4 +1,4 @@
-simulateModel("Buildings.Experimental.DHC.EnergyTransferStations.Combined.Subsystems.Validation.WatersideEconomizer",
+simulateModel("Buildings.DHC.ETS.Combined.Subsystems.Validation.WatersideEconomizer",
     method="Cvode",
     tolerance=1e-6,
     stopTime=5000,
diff --git a/Buildings/Resources/Scripts/Dymola/Experimental/DHC/EnergyTransferStations/Combined/Validation/ChillerBorefield.mos b/Buildings/Resources/Scripts/Dymola/DHC/ETS/Combined/Validation/ChillerBorefield.mos
similarity index 96%
rename from Buildings/Resources/Scripts/Dymola/Experimental/DHC/EnergyTransferStations/Combined/Validation/ChillerBorefield.mos
rename to Buildings/Resources/Scripts/Dymola/DHC/ETS/Combined/Validation/ChillerBorefield.mos
index 27795952786..7c23a9bfa3a 100644
--- a/Buildings/Resources/Scripts/Dymola/Experimental/DHC/EnergyTransferStations/Combined/Validation/ChillerBorefield.mos
+++ b/Buildings/Resources/Scripts/Dymola/DHC/ETS/Combined/Validation/ChillerBorefield.mos
@@ -1,4 +1,4 @@
-simulateModel("Buildings.Experimental.DHC.EnergyTransferStations.Combined.Validation.ChillerBorefield",
+simulateModel("Buildings.DHC.ETS.Combined.Validation.ChillerBorefield",
     method="Cvode",
     tolerance=1e-6,
     stopTime=360000,
diff --git a/Buildings/Resources/Scripts/Dymola/Experimental/DHC/EnergyTransferStations/Combined/Validation/ChillerOnly.mos b/Buildings/Resources/Scripts/Dymola/DHC/ETS/Combined/Validation/ChillerOnly.mos
similarity index 96%
rename from Buildings/Resources/Scripts/Dymola/Experimental/DHC/EnergyTransferStations/Combined/Validation/ChillerOnly.mos
rename to Buildings/Resources/Scripts/Dymola/DHC/ETS/Combined/Validation/ChillerOnly.mos
index cfa3e0bc5f9..7cc9d56c68d 100644
--- a/Buildings/Resources/Scripts/Dymola/Experimental/DHC/EnergyTransferStations/Combined/Validation/ChillerOnly.mos
+++ b/Buildings/Resources/Scripts/Dymola/DHC/ETS/Combined/Validation/ChillerOnly.mos
@@ -1,4 +1,4 @@
-simulateModel("Buildings.Experimental.DHC.EnergyTransferStations.Combined.Validation.ChillerOnly",
+simulateModel("Buildings.DHC.ETS.Combined.Validation.ChillerOnly",
     method="Cvode",
     tolerance=1e-6,
     stopTime=360000,
diff --git a/Buildings/Resources/Scripts/Dymola/Experimental/DHC/EnergyTransferStations/Combined/Validation/ChillerWSE.mos b/Buildings/Resources/Scripts/Dymola/DHC/ETS/Combined/Validation/ChillerWSE.mos
similarity index 96%
rename from Buildings/Resources/Scripts/Dymola/Experimental/DHC/EnergyTransferStations/Combined/Validation/ChillerWSE.mos
rename to Buildings/Resources/Scripts/Dymola/DHC/ETS/Combined/Validation/ChillerWSE.mos
index 8779347cce7..be7f8d971b1 100644
--- a/Buildings/Resources/Scripts/Dymola/Experimental/DHC/EnergyTransferStations/Combined/Validation/ChillerWSE.mos
+++ b/Buildings/Resources/Scripts/Dymola/DHC/ETS/Combined/Validation/ChillerWSE.mos
@@ -1,4 +1,4 @@
-simulateModel("Buildings.Experimental.DHC.EnergyTransferStations.Combined.Validation.ChillerWSE",
+simulateModel("Buildings.DHC.ETS.Combined.Validation.ChillerWSE",
     method="Cvode",
     tolerance=1e-6,
     stopTime=360000,
diff --git a/Buildings/Resources/Scripts/Dymola/Experimental/DHC/EnergyTransferStations/Cooling/Examples/Direct.mos b/Buildings/Resources/Scripts/Dymola/DHC/ETS/Cooling/Examples/Direct.mos
similarity index 86%
rename from Buildings/Resources/Scripts/Dymola/Experimental/DHC/EnergyTransferStations/Cooling/Examples/Direct.mos
rename to Buildings/Resources/Scripts/Dymola/DHC/ETS/Cooling/Examples/Direct.mos
index 166ee358e44..68a6fba34a6 100644
--- a/Buildings/Resources/Scripts/Dymola/Experimental/DHC/EnergyTransferStations/Cooling/Examples/Direct.mos
+++ b/Buildings/Resources/Scripts/Dymola/DHC/ETS/Cooling/Examples/Direct.mos
@@ -1,5 +1,5 @@
 // Simulate
-simulateModel("Buildings.Experimental.DHC.EnergyTransferStations.Cooling.Examples.Direct", tolerance=1e-6, stopTime=86400, numberOfIntervals=500, resultFile="Direct");
+simulateModel("Buildings.DHC.ETS.Cooling.Examples.Direct", tolerance=1e-6, stopTime=86400, numberOfIntervals=500, resultFile="Direct");
 // Plot commands
 createPlot(id=1, 
   position={11, 19, 713, 564}, 
diff --git a/Buildings/Resources/Scripts/Dymola/Experimental/DHC/EnergyTransferStations/Cooling/Examples/Indirect.mos b/Buildings/Resources/Scripts/Dymola/DHC/ETS/Cooling/Examples/Indirect.mos
similarity index 94%
rename from Buildings/Resources/Scripts/Dymola/Experimental/DHC/EnergyTransferStations/Cooling/Examples/Indirect.mos
rename to Buildings/Resources/Scripts/Dymola/DHC/ETS/Cooling/Examples/Indirect.mos
index 39714511ad5..c9b2c061610 100644
--- a/Buildings/Resources/Scripts/Dymola/Experimental/DHC/EnergyTransferStations/Cooling/Examples/Indirect.mos
+++ b/Buildings/Resources/Scripts/Dymola/DHC/ETS/Cooling/Examples/Indirect.mos
@@ -1,5 +1,5 @@
 // Simulate
-simulateModel("Buildings.Experimental.DHC.EnergyTransferStations.Cooling.Examples.Indirect", 
+simulateModel("Buildings.DHC.ETS.Cooling.Examples.Indirect", 
     stopTime=86400, 
     tolerance=1e-06, 
     numberOfIntervals=500,
diff --git a/Buildings/Resources/Scripts/Dymola/Experimental/DHC/EnergyTransferStations/Heating/Examples/Direct.mos b/Buildings/Resources/Scripts/Dymola/DHC/ETS/Heating/Examples/Direct.mos
similarity index 86%
rename from Buildings/Resources/Scripts/Dymola/Experimental/DHC/EnergyTransferStations/Heating/Examples/Direct.mos
rename to Buildings/Resources/Scripts/Dymola/DHC/ETS/Heating/Examples/Direct.mos
index a293e1ae956..4d8924976b7 100644
--- a/Buildings/Resources/Scripts/Dymola/Experimental/DHC/EnergyTransferStations/Heating/Examples/Direct.mos
+++ b/Buildings/Resources/Scripts/Dymola/DHC/ETS/Heating/Examples/Direct.mos
@@ -1,5 +1,5 @@
 // Simulate
-simulateModel("Buildings.Experimental.DHC.EnergyTransferStations.Heating.Examples.Direct", tolerance=1e-6, stopTime=86400, numberOfIntervals=500, resultFile="Direct");
+simulateModel("Buildings.DHC.ETS.Heating.Examples.Direct", tolerance=1e-6, stopTime=86400, numberOfIntervals=500, resultFile="Direct");
 // Plot commands
 createPlot(id=1, 
   position={11, 19, 713, 564}, 
diff --git a/Buildings/Resources/Scripts/Dymola/Experimental/DHC/EnergyTransferStations/Heating/Examples/Indirect.mos b/Buildings/Resources/Scripts/Dymola/DHC/ETS/Heating/Examples/Indirect.mos
similarity index 94%
rename from Buildings/Resources/Scripts/Dymola/Experimental/DHC/EnergyTransferStations/Heating/Examples/Indirect.mos
rename to Buildings/Resources/Scripts/Dymola/DHC/ETS/Heating/Examples/Indirect.mos
index fea7c029f51..f8b74595951 100644
--- a/Buildings/Resources/Scripts/Dymola/Experimental/DHC/EnergyTransferStations/Heating/Examples/Indirect.mos
+++ b/Buildings/Resources/Scripts/Dymola/DHC/ETS/Heating/Examples/Indirect.mos
@@ -1,5 +1,5 @@
 // Simulate
-simulateModel("Buildings.Experimental.DHC.EnergyTransferStations.Heating.Examples.Indirect", 
+simulateModel("Buildings.DHC.ETS.Heating.Examples.Indirect", 
     stopTime=86400, 
     tolerance=1e-06, 
     numberOfIntervals=500,
diff --git a/Buildings/Resources/Scripts/Dymola/Experimental/DHC/Examples/Combined/SeriesConstantFlow.mos b/Buildings/Resources/Scripts/Dymola/DHC/Examples/Combined/SeriesConstantFlow.mos
similarity index 98%
rename from Buildings/Resources/Scripts/Dymola/Experimental/DHC/Examples/Combined/SeriesConstantFlow.mos
rename to Buildings/Resources/Scripts/Dymola/DHC/Examples/Combined/SeriesConstantFlow.mos
index 1c2cb5c762c..2aaf6e93dbd 100644
--- a/Buildings/Resources/Scripts/Dymola/Experimental/DHC/Examples/Combined/SeriesConstantFlow.mos
+++ b/Buildings/Resources/Scripts/Dymola/DHC/Examples/Combined/SeriesConstantFlow.mos
@@ -1,5 +1,5 @@
 removePlots();
-simulateModel("Buildings.Experimental.DHC.Examples.Combined.SeriesConstantFlow",
+simulateModel("Buildings.DHC.Examples.Combined.SeriesConstantFlow",
     method="cvode",
     tolerance=1e-6,
     startTime=0,
diff --git a/Buildings/Resources/Scripts/Dymola/Experimental/DHC/Examples/Combined/SeriesVariableFlow.mos b/Buildings/Resources/Scripts/Dymola/DHC/Examples/Combined/SeriesVariableFlow.mos
similarity index 98%
rename from Buildings/Resources/Scripts/Dymola/Experimental/DHC/Examples/Combined/SeriesVariableFlow.mos
rename to Buildings/Resources/Scripts/Dymola/DHC/Examples/Combined/SeriesVariableFlow.mos
index 60865332993..a5f1d8ca68f 100644
--- a/Buildings/Resources/Scripts/Dymola/Experimental/DHC/Examples/Combined/SeriesVariableFlow.mos
+++ b/Buildings/Resources/Scripts/Dymola/DHC/Examples/Combined/SeriesVariableFlow.mos
@@ -1,5 +1,5 @@
 removePlots();
-simulateModel("Buildings.Experimental.DHC.Examples.Combined.SeriesVariableFlow",
+simulateModel("Buildings.DHC.Examples.Combined.SeriesVariableFlow",
     method="cvode",
     tolerance=1e-6,
     startTime=0,
diff --git a/Buildings/Resources/Scripts/Dymola/Experimental/DHC/Examples/Combined/SeriesVariableFlowAgentControl.mos b/Buildings/Resources/Scripts/Dymola/DHC/Examples/Combined/SeriesVariableFlowAgentControl.mos
similarity index 97%
rename from Buildings/Resources/Scripts/Dymola/Experimental/DHC/Examples/Combined/SeriesVariableFlowAgentControl.mos
rename to Buildings/Resources/Scripts/Dymola/DHC/Examples/Combined/SeriesVariableFlowAgentControl.mos
index 15c5bf2fbb6..eea5b448c71 100644
--- a/Buildings/Resources/Scripts/Dymola/Experimental/DHC/Examples/Combined/SeriesVariableFlowAgentControl.mos
+++ b/Buildings/Resources/Scripts/Dymola/DHC/Examples/Combined/SeriesVariableFlowAgentControl.mos
@@ -1,5 +1,5 @@
 removePlots();
-simulateModel("Buildings.Experimental.DHC.Examples.Combined.SeriesVariableFlowAgentControl",
+simulateModel("Buildings.DHC.Examples.Combined.SeriesVariableFlowAgentControl",
     method="cvode",
     tolerance=1e-6,
     startTime=0,
diff --git a/Buildings/Resources/Scripts/Dymola/Experimental/DHC/Examples/Cooling/ElectricChillersDirectETS.mos b/Buildings/Resources/Scripts/Dymola/DHC/Examples/Cooling/ElectricChillersDirectETS.mos
similarity index 79%
rename from Buildings/Resources/Scripts/Dymola/Experimental/DHC/Examples/Cooling/ElectricChillersDirectETS.mos
rename to Buildings/Resources/Scripts/Dymola/DHC/Examples/Cooling/ElectricChillersDirectETS.mos
index 234843485bd..2ddf0102fcb 100644
--- a/Buildings/Resources/Scripts/Dymola/Experimental/DHC/Examples/Cooling/ElectricChillersDirectETS.mos
+++ b/Buildings/Resources/Scripts/Dymola/DHC/Examples/Cooling/ElectricChillersDirectETS.mos
@@ -1,5 +1,5 @@
 // Simulate
-simulateModel("Buildings.Experimental.DHC.Examples.Cooling.ElectricChillersDirectETS", tolerance=1e-6, startTime=15724800, stopTime=16329600, method="CVode", resultFile="ElectricChillersDirectETS");
+simulateModel("Buildings.DHC.Examples.Cooling.ElectricChillersDirectETS", tolerance=1e-6, startTime=15724800, stopTime=16329600, method="CVode", resultFile="ElectricChillersDirectETS");
 // Plot commands
 removePlots(true);
 createPlot(id=1,
diff --git a/Buildings/Resources/Scripts/Dymola/Experimental/DHC/Examples/Steam/SingleBoiler.mos b/Buildings/Resources/Scripts/Dymola/DHC/Examples/Steam/SingleBoiler.mos
similarity index 94%
rename from Buildings/Resources/Scripts/Dymola/Experimental/DHC/Examples/Steam/SingleBoiler.mos
rename to Buildings/Resources/Scripts/Dymola/DHC/Examples/Steam/SingleBoiler.mos
index 33458012062..ec6e941e5f4 100644
--- a/Buildings/Resources/Scripts/Dymola/Experimental/DHC/Examples/Steam/SingleBoiler.mos
+++ b/Buildings/Resources/Scripts/Dymola/DHC/Examples/Steam/SingleBoiler.mos
@@ -1,5 +1,5 @@
 // Simulate
-simulateModel("Buildings.Experimental.DHC.Examples.Steam.SingleBoiler", stopTime=86400, method="Dassl", tolerance=1e-06, resultFile="SingleBoiler");
+simulateModel("Buildings.DHC.Examples.Steam.SingleBoiler", stopTime=86400, method="Dassl", tolerance=1e-06, resultFile="SingleBoiler");
 // Plot commands
 createPlot(id=1, position={10, 18, 570, 506}, 
   y={"pla.QFue_flow"}, 
diff --git a/Buildings/Resources/Scripts/Dymola/Experimental/DHC/Loads/BaseClasses/Controls/Validation/MixingValveControl.mos b/Buildings/Resources/Scripts/Dymola/DHC/Loads/BaseClasses/Controls/Validation/MixingValveControl.mos
similarity index 91%
rename from Buildings/Resources/Scripts/Dymola/Experimental/DHC/Loads/BaseClasses/Controls/Validation/MixingValveControl.mos
rename to Buildings/Resources/Scripts/Dymola/DHC/Loads/BaseClasses/Controls/Validation/MixingValveControl.mos
index 4308b3e6d48..df5ea0a0418 100644
--- a/Buildings/Resources/Scripts/Dymola/Experimental/DHC/Loads/BaseClasses/Controls/Validation/MixingValveControl.mos
+++ b/Buildings/Resources/Scripts/Dymola/DHC/Loads/BaseClasses/Controls/Validation/MixingValveControl.mos
@@ -1,6 +1,6 @@
 old_flag = Advanced.StoreProtectedVariables;
 Advanced.StoreProtectedVariables = true;
-simulateModel("Buildings.Experimental.DHC.Loads.BaseClasses.Controls.Validation.MixingValveControl",
+simulateModel("Buildings.DHC.Loads.BaseClasses.Controls.Validation.MixingValveControl",
     method="cvode",
     tolerance=1e-6,
     numberOfIntervals=500,
diff --git a/Buildings/Resources/Scripts/Dymola/Experimental/DHC/Loads/BaseClasses/Examples/CouplingRCZ1Valve.mos b/Buildings/Resources/Scripts/Dymola/DHC/Loads/BaseClasses/Examples/CouplingRCZ1Valve.mos
similarity index 94%
rename from Buildings/Resources/Scripts/Dymola/Experimental/DHC/Loads/BaseClasses/Examples/CouplingRCZ1Valve.mos
rename to Buildings/Resources/Scripts/Dymola/DHC/Loads/BaseClasses/Examples/CouplingRCZ1Valve.mos
index 5ff2dd48151..3273e5889ff 100644
--- a/Buildings/Resources/Scripts/Dymola/Experimental/DHC/Loads/BaseClasses/Examples/CouplingRCZ1Valve.mos
+++ b/Buildings/Resources/Scripts/Dymola/DHC/Loads/BaseClasses/Examples/CouplingRCZ1Valve.mos
@@ -1,4 +1,4 @@
-simulateModel("Buildings.Experimental.DHC.Loads.BaseClasses.Examples.CouplingRCZ1Valve",
+simulateModel("Buildings.DHC.Loads.BaseClasses.Examples.CouplingRCZ1Valve",
     method="cvode",
     tolerance=1e-6,
     numberOfIntervals=500,
diff --git a/Buildings/Resources/Scripts/Dymola/Experimental/DHC/Loads/BaseClasses/Examples/CouplingRCZ6.mos b/Buildings/Resources/Scripts/Dymola/DHC/Loads/BaseClasses/Examples/CouplingRCZ6.mos
similarity index 96%
rename from Buildings/Resources/Scripts/Dymola/Experimental/DHC/Loads/BaseClasses/Examples/CouplingRCZ6.mos
rename to Buildings/Resources/Scripts/Dymola/DHC/Loads/BaseClasses/Examples/CouplingRCZ6.mos
index 060f25f3b71..8ef5fb11963 100644
--- a/Buildings/Resources/Scripts/Dymola/Experimental/DHC/Loads/BaseClasses/Examples/CouplingRCZ6.mos
+++ b/Buildings/Resources/Scripts/Dymola/DHC/Loads/BaseClasses/Examples/CouplingRCZ6.mos
@@ -1,4 +1,4 @@
-simulateModel("Buildings.Experimental.DHC.Loads.BaseClasses.Examples.CouplingRCZ6",
+simulateModel("Buildings.DHC.Loads.BaseClasses.Examples.CouplingRCZ6",
     method="cvode",
     tolerance=1e-6,
     numberOfIntervals=500,
diff --git a/Buildings/Resources/Scripts/Dymola/Experimental/DHC/Loads/BaseClasses/Examples/CouplingSpawnZ1.mos b/Buildings/Resources/Scripts/Dymola/DHC/Loads/BaseClasses/Examples/CouplingSpawnZ1.mos
similarity index 95%
rename from Buildings/Resources/Scripts/Dymola/Experimental/DHC/Loads/BaseClasses/Examples/CouplingSpawnZ1.mos
rename to Buildings/Resources/Scripts/Dymola/DHC/Loads/BaseClasses/Examples/CouplingSpawnZ1.mos
index 9abd145501f..1141f22082c 100644
--- a/Buildings/Resources/Scripts/Dymola/Experimental/DHC/Loads/BaseClasses/Examples/CouplingSpawnZ1.mos
+++ b/Buildings/Resources/Scripts/Dymola/DHC/Loads/BaseClasses/Examples/CouplingSpawnZ1.mos
@@ -1,6 +1,6 @@
 old_hidden_avoid_double_computation=Hidden.AvoidDoubleComputation;
 Hidden.AvoidDoubleComputation=true;
-simulateModel("Buildings.Experimental.DHC.Loads.BaseClasses.Examples.CouplingSpawnZ1",
+simulateModel("Buildings.DHC.Loads.BaseClasses.Examples.CouplingSpawnZ1",
     method="cvode",
     tolerance=1e-6,
     numberOfIntervals=500,
diff --git a/Buildings/Resources/Scripts/Dymola/Experimental/DHC/Loads/BaseClasses/Examples/CouplingSpawnZ6.mos b/Buildings/Resources/Scripts/Dymola/DHC/Loads/BaseClasses/Examples/CouplingSpawnZ6.mos
similarity index 96%
rename from Buildings/Resources/Scripts/Dymola/Experimental/DHC/Loads/BaseClasses/Examples/CouplingSpawnZ6.mos
rename to Buildings/Resources/Scripts/Dymola/DHC/Loads/BaseClasses/Examples/CouplingSpawnZ6.mos
index 8674924f22b..5f18e94f648 100644
--- a/Buildings/Resources/Scripts/Dymola/Experimental/DHC/Loads/BaseClasses/Examples/CouplingSpawnZ6.mos
+++ b/Buildings/Resources/Scripts/Dymola/DHC/Loads/BaseClasses/Examples/CouplingSpawnZ6.mos
@@ -1,6 +1,6 @@
 old_hidden_avoid_double_computation=Hidden.AvoidDoubleComputation;
 Hidden.AvoidDoubleComputation=true;
-simulateModel("Buildings.Experimental.DHC.Loads.BaseClasses.Examples.CouplingSpawnZ6",
+simulateModel("Buildings.DHC.Loads.BaseClasses.Examples.CouplingSpawnZ6",
     method="cvode",
     tolerance=1e-6,
     numberOfIntervals=500,
diff --git a/Buildings/Resources/Scripts/Dymola/Experimental/DHC/Loads/BaseClasses/Examples/CouplingTimeSeries.mos b/Buildings/Resources/Scripts/Dymola/DHC/Loads/BaseClasses/Examples/CouplingTimeSeries.mos
similarity index 95%
rename from Buildings/Resources/Scripts/Dymola/Experimental/DHC/Loads/BaseClasses/Examples/CouplingTimeSeries.mos
rename to Buildings/Resources/Scripts/Dymola/DHC/Loads/BaseClasses/Examples/CouplingTimeSeries.mos
index e78833d4fc5..0bb06cbcb28 100644
--- a/Buildings/Resources/Scripts/Dymola/Experimental/DHC/Loads/BaseClasses/Examples/CouplingTimeSeries.mos
+++ b/Buildings/Resources/Scripts/Dymola/DHC/Loads/BaseClasses/Examples/CouplingTimeSeries.mos
@@ -1,4 +1,4 @@
-simulateModel("Buildings.Experimental.DHC.Loads.BaseClasses.Examples.CouplingTimeSeries",
+simulateModel("Buildings.DHC.Loads.BaseClasses.Examples.CouplingTimeSeries",
     method="cvode",
     tolerance=1e-6,
     stopTime=604800.0,
diff --git a/Buildings/Resources/Scripts/Dymola/Experimental/DHC/Loads/BaseClasses/Examples/CouplingTimeSeriesSingleLoop.mos b/Buildings/Resources/Scripts/Dymola/DHC/Loads/BaseClasses/Examples/CouplingTimeSeriesSingleLoop.mos
similarity index 94%
rename from Buildings/Resources/Scripts/Dymola/Experimental/DHC/Loads/BaseClasses/Examples/CouplingTimeSeriesSingleLoop.mos
rename to Buildings/Resources/Scripts/Dymola/DHC/Loads/BaseClasses/Examples/CouplingTimeSeriesSingleLoop.mos
index fc58000de1e..2d33b59bf5c 100644
--- a/Buildings/Resources/Scripts/Dymola/Experimental/DHC/Loads/BaseClasses/Examples/CouplingTimeSeriesSingleLoop.mos
+++ b/Buildings/Resources/Scripts/Dymola/DHC/Loads/BaseClasses/Examples/CouplingTimeSeriesSingleLoop.mos
@@ -1,4 +1,4 @@
-simulateModel("Buildings.Experimental.DHC.Loads.BaseClasses.Examples.CouplingTimeSeriesSingleLoop",
+simulateModel("Buildings.DHC.Loads.BaseClasses.Examples.CouplingTimeSeriesSingleLoop",
     method="cvode",
     tolerance=1e-6,
     numberOfIntervals=500,
diff --git a/Buildings/Resources/Scripts/Dymola/Experimental/DHC/Loads/BaseClasses/Validation/BenchmarkFlowDistribution1.mos b/Buildings/Resources/Scripts/Dymola/DHC/Loads/BaseClasses/Validation/BenchmarkFlowDistribution1.mos
similarity index 85%
rename from Buildings/Resources/Scripts/Dymola/Experimental/DHC/Loads/BaseClasses/Validation/BenchmarkFlowDistribution1.mos
rename to Buildings/Resources/Scripts/Dymola/DHC/Loads/BaseClasses/Validation/BenchmarkFlowDistribution1.mos
index 79a5be3e420..33fa94c87cd 100644
--- a/Buildings/Resources/Scripts/Dymola/Experimental/DHC/Loads/BaseClasses/Validation/BenchmarkFlowDistribution1.mos
+++ b/Buildings/Resources/Scripts/Dymola/DHC/Loads/BaseClasses/Validation/BenchmarkFlowDistribution1.mos
@@ -1,4 +1,4 @@
-simulateModel("Buildings.Experimental.DHC.Loads.BaseClasses.Validation.BenchmarkFlowDistribution1",
+simulateModel("Buildings.DHC.Loads.BaseClasses.Validation.BenchmarkFlowDistribution1",
     method="cvode",
     tolerance=1e-6,
     numberOfIntervals=500,
diff --git a/Buildings/Resources/Scripts/Dymola/Experimental/DHC/Loads/BaseClasses/Validation/BenchmarkFlowDistribution2.mos b/Buildings/Resources/Scripts/Dymola/DHC/Loads/BaseClasses/Validation/BenchmarkFlowDistribution2.mos
similarity index 85%
rename from Buildings/Resources/Scripts/Dymola/Experimental/DHC/Loads/BaseClasses/Validation/BenchmarkFlowDistribution2.mos
rename to Buildings/Resources/Scripts/Dymola/DHC/Loads/BaseClasses/Validation/BenchmarkFlowDistribution2.mos
index d6c0362ec31..b2e784cf22e 100644
--- a/Buildings/Resources/Scripts/Dymola/Experimental/DHC/Loads/BaseClasses/Validation/BenchmarkFlowDistribution2.mos
+++ b/Buildings/Resources/Scripts/Dymola/DHC/Loads/BaseClasses/Validation/BenchmarkFlowDistribution2.mos
@@ -1,4 +1,4 @@
-simulateModel("Buildings.Experimental.DHC.Loads.BaseClasses.Validation.BenchmarkFlowDistribution2",
+simulateModel("Buildings.DHC.Loads.BaseClasses.Validation.BenchmarkFlowDistribution2",
     method="cvode",
     tolerance=1e-6,
     numberOfIntervals=500,
diff --git a/Buildings/Resources/Scripts/Dymola/Experimental/DHC/Loads/BaseClasses/Validation/BuildingWithETS.mos b/Buildings/Resources/Scripts/Dymola/DHC/Loads/BaseClasses/Validation/BuildingWithETS.mos
similarity index 89%
rename from Buildings/Resources/Scripts/Dymola/Experimental/DHC/Loads/BaseClasses/Validation/BuildingWithETS.mos
rename to Buildings/Resources/Scripts/Dymola/DHC/Loads/BaseClasses/Validation/BuildingWithETS.mos
index 11a16de72c6..f64a80d0f73 100644
--- a/Buildings/Resources/Scripts/Dymola/Experimental/DHC/Loads/BaseClasses/Validation/BuildingWithETS.mos
+++ b/Buildings/Resources/Scripts/Dymola/DHC/Loads/BaseClasses/Validation/BuildingWithETS.mos
@@ -1,4 +1,4 @@
-simulateModel("Buildings.Experimental.DHC.Loads.BaseClasses.Validation.BuildingWithETS",
+simulateModel("Buildings.DHC.Loads.BaseClasses.Validation.BuildingWithETS",
     method="Cvode",
     tolerance=1e-6,
     stopTime=1.0,
diff --git a/Buildings/Resources/Scripts/Dymola/Experimental/DHC/Loads/BaseClasses/Validation/FlowDistributionPumpControl.mos b/Buildings/Resources/Scripts/Dymola/DHC/Loads/BaseClasses/Validation/FlowDistributionPumpControl.mos
similarity index 87%
rename from Buildings/Resources/Scripts/Dymola/Experimental/DHC/Loads/BaseClasses/Validation/FlowDistributionPumpControl.mos
rename to Buildings/Resources/Scripts/Dymola/DHC/Loads/BaseClasses/Validation/FlowDistributionPumpControl.mos
index e363d07a88b..5fe5ac8f61c 100644
--- a/Buildings/Resources/Scripts/Dymola/Experimental/DHC/Loads/BaseClasses/Validation/FlowDistributionPumpControl.mos
+++ b/Buildings/Resources/Scripts/Dymola/DHC/Loads/BaseClasses/Validation/FlowDistributionPumpControl.mos
@@ -1,4 +1,4 @@
-simulateModel("Buildings.Experimental.DHC.Loads.BaseClasses.Validation.FlowDistributionPumpControl",
+simulateModel("Buildings.DHC.Loads.BaseClasses.Validation.FlowDistributionPumpControl",
     method="cvode",
     tolerance=1e-6,
     numberOfIntervals=500,
diff --git a/Buildings/Resources/Scripts/Dymola/Experimental/DHC/Loads/BaseClasses/Validation/GetPeakLoad.mos b/Buildings/Resources/Scripts/Dymola/DHC/Loads/BaseClasses/Validation/GetPeakLoad.mos
similarity index 79%
rename from Buildings/Resources/Scripts/Dymola/Experimental/DHC/Loads/BaseClasses/Validation/GetPeakLoad.mos
rename to Buildings/Resources/Scripts/Dymola/DHC/Loads/BaseClasses/Validation/GetPeakLoad.mos
index 48aa30d635f..ac6db86475e 100644
--- a/Buildings/Resources/Scripts/Dymola/Experimental/DHC/Loads/BaseClasses/Validation/GetPeakLoad.mos
+++ b/Buildings/Resources/Scripts/Dymola/DHC/Loads/BaseClasses/Validation/GetPeakLoad.mos
@@ -1,4 +1,4 @@
-simulateModel("Buildings.Experimental.DHC.Loads.BaseClasses.Validation.GetPeakLoad",
+simulateModel("Buildings.DHC.Loads.BaseClasses.Validation.GetPeakLoad",
     method="Cvode",
     tolerance=1e-6,
     stopTime=1.0,
diff --git a/Buildings/Resources/Scripts/Dymola/Experimental/DHC/Loads/BaseClasses/Validation/SimpleRoomODE.mos b/Buildings/Resources/Scripts/Dymola/DHC/Loads/BaseClasses/Validation/SimpleRoomODE.mos
similarity index 86%
rename from Buildings/Resources/Scripts/Dymola/Experimental/DHC/Loads/BaseClasses/Validation/SimpleRoomODE.mos
rename to Buildings/Resources/Scripts/Dymola/DHC/Loads/BaseClasses/Validation/SimpleRoomODE.mos
index 4e957d8d2df..c105973e771 100644
--- a/Buildings/Resources/Scripts/Dymola/Experimental/DHC/Loads/BaseClasses/Validation/SimpleRoomODE.mos
+++ b/Buildings/Resources/Scripts/Dymola/DHC/Loads/BaseClasses/Validation/SimpleRoomODE.mos
@@ -1,4 +1,4 @@
-simulateModel("Buildings.Experimental.DHC.Loads.BaseClasses.Validation.SimpleRoomODE",
+simulateModel("Buildings.DHC.Loads.BaseClasses.Validation.SimpleRoomODE",
     method="cvode",
     tolerance=1e-6,
     numberOfIntervals=500,
diff --git a/Buildings/Resources/Scripts/Dymola/Experimental/DHC/Loads/BaseClasses/Validation/TerminalUnitScaling.mos b/Buildings/Resources/Scripts/Dymola/DHC/Loads/BaseClasses/Validation/TerminalUnitScaling.mos
similarity index 88%
rename from Buildings/Resources/Scripts/Dymola/Experimental/DHC/Loads/BaseClasses/Validation/TerminalUnitScaling.mos
rename to Buildings/Resources/Scripts/Dymola/DHC/Loads/BaseClasses/Validation/TerminalUnitScaling.mos
index 41d2f65c723..0b9a7477906 100644
--- a/Buildings/Resources/Scripts/Dymola/Experimental/DHC/Loads/BaseClasses/Validation/TerminalUnitScaling.mos
+++ b/Buildings/Resources/Scripts/Dymola/DHC/Loads/BaseClasses/Validation/TerminalUnitScaling.mos
@@ -1,4 +1,4 @@
-simulateModel("Buildings.Experimental.DHC.Loads.BaseClasses.Validation.TerminalUnitScaling",
+simulateModel("Buildings.DHC.Loads.BaseClasses.Validation.TerminalUnitScaling",
     method="cvode",
     tolerance=1e-6,
     stopTime=1000.0,
diff --git a/Buildings/Resources/Scripts/Dymola/Experimental/DHC/Loads/Combined/Examples/BuildingTimeSeriesWithETS.mos b/Buildings/Resources/Scripts/Dymola/DHC/Loads/Combined/Examples/BuildingTimeSeriesWithETS.mos
similarity index 84%
rename from Buildings/Resources/Scripts/Dymola/Experimental/DHC/Loads/Combined/Examples/BuildingTimeSeriesWithETS.mos
rename to Buildings/Resources/Scripts/Dymola/DHC/Loads/Combined/Examples/BuildingTimeSeriesWithETS.mos
index 3a744c9fd35..f9f48a32ee9 100644
--- a/Buildings/Resources/Scripts/Dymola/Experimental/DHC/Loads/Combined/Examples/BuildingTimeSeriesWithETS.mos
+++ b/Buildings/Resources/Scripts/Dymola/DHC/Loads/Combined/Examples/BuildingTimeSeriesWithETS.mos
@@ -1,4 +1,4 @@
-simulateModel("Buildings.Experimental.DHC.Loads.Combined.Examples.BuildingTimeSeriesWithETS", tolerance=1e-6, startTime=0, stopTime=864000, method="CVode", resultFile="BuildingTimeSeriesWithETS");
+simulateModel("Buildings.DHC.Loads.Combined.Examples.BuildingTimeSeriesWithETS", tolerance=1e-6, startTime=0, stopTime=864000, method="CVode", resultFile="BuildingTimeSeriesWithETS");
 createPlot(id=1, position={540, 9, 784, 617}, y={"bui.ets.proHeaWat.heaPum.QCon_flow_nominal", "bui.ets.proHeaWat.heaPum.QCon_flow"}, range={0.0, 10.0, -200000.0, 400000.0}, grid=true, subPlot=101, colors={{28,108,200}, {238,46,47}}, timeUnit="d", displayUnits={"W", "W"});
 createPlot(id=1, position={540, 9, 784, 617}, y={"bui.ets.proHotWat.heaPum.QCon_flow_nominal", "bui.ets.proHotWat.heaPum.QCon_flow"}, range={0.0, 10.0, -2000.0, 4000.0}, grid=true, subPlot=102, colors={{28,108,200}, {238,46,47}}, timeUnit="d", displayUnits={"W", "W"});
 createPlot(id=1, position={540, 9, 784, 617}, y={"bui.PHea", "bui.PPum"}, range={0.0, 10.0, -50000.0, 100000.0}, grid=true, subPlot=103, colors={{28,108,200}, {238,46,47}}, timeUnit="d", displayUnits={"W", "W"});
diff --git a/Buildings/Resources/Scripts/Dymola/Experimental/DHC/Loads/Combined/Examples/BuildingTimeSeriesWithETSDHWTank.mos b/Buildings/Resources/Scripts/Dymola/DHC/Loads/Combined/Examples/BuildingTimeSeriesWithETSDHWTank.mos
similarity index 92%
rename from Buildings/Resources/Scripts/Dymola/Experimental/DHC/Loads/Combined/Examples/BuildingTimeSeriesWithETSDHWTank.mos
rename to Buildings/Resources/Scripts/Dymola/DHC/Loads/Combined/Examples/BuildingTimeSeriesWithETSDHWTank.mos
index 7bf0c32967e..74a93c1f496 100644
--- a/Buildings/Resources/Scripts/Dymola/Experimental/DHC/Loads/Combined/Examples/BuildingTimeSeriesWithETSDHWTank.mos
+++ b/Buildings/Resources/Scripts/Dymola/DHC/Loads/Combined/Examples/BuildingTimeSeriesWithETSDHWTank.mos
@@ -1,4 +1,4 @@
-simulateModel("Buildings.Experimental.DHC.Loads.Combined.Examples.BuildingTimeSeriesWithETSDHWTank", tolerance=1e-6, startTime=0, stopTime=864000, method="CVode", resultFile="BuildingTimeSeriesWithETSDHWTank");
+simulateModel("Buildings.DHC.Loads.Combined.Examples.BuildingTimeSeriesWithETSDHWTank", tolerance=1e-6, startTime=0, stopTime=864000, method="CVode", resultFile="BuildingTimeSeriesWithETSDHWTank");
 createPlot(id=1, position={540, 9, 784, 617}, y={"bui.ets.proHeaWat.heaPum.QCon_flow_nominal", "bui.ets.proHeaWat.heaPum.QCon_flow"}, range={0.0, 10.0, -200000.0, 400000.0}, grid=true, subPlot=101, colors={{28,108,200}, {238,46,47}}, timeUnit="d", displayUnits={"W", "W"});
 createPlot(id=1, position={540, 9, 784, 617}, y={"bui.bui.QReqHea_flow", "bui.bui.QReqCoo_flow", "bui.bui.QHea_flow", "bui.bui.QCoo_flow"}, range={0.0, 10.0, -200000.0, 400000.0}, grid=true, subPlot=102, colors={{28,108,200}, {238,46,47}, {0,140,72}, {217,67,180}}, timeUnit="d", displayUnits={"W", "W", "W", "W"});
 createPlot(id=1, position={540, 9, 784, 617}, y={"bui.PHea", "bui.PPum"}, range={0.0, 10.0, -50000.0, 100000.0}, grid=true, subPlot=103, colors={{28,108,200}, {238,46,47}}, timeUnit="d", displayUnits={"W", "W"});
diff --git a/Buildings/Resources/Scripts/Dymola/Experimental/DHC/Loads/Cooling/Examples/BuildingTimeSeriesWithETS.mos b/Buildings/Resources/Scripts/Dymola/DHC/Loads/Cooling/Examples/BuildingTimeSeriesWithETS.mos
similarity index 79%
rename from Buildings/Resources/Scripts/Dymola/Experimental/DHC/Loads/Cooling/Examples/BuildingTimeSeriesWithETS.mos
rename to Buildings/Resources/Scripts/Dymola/DHC/Loads/Cooling/Examples/BuildingTimeSeriesWithETS.mos
index 888800902e9..442d9d74aaf 100644
--- a/Buildings/Resources/Scripts/Dymola/Experimental/DHC/Loads/Cooling/Examples/BuildingTimeSeriesWithETS.mos
+++ b/Buildings/Resources/Scripts/Dymola/DHC/Loads/Cooling/Examples/BuildingTimeSeriesWithETS.mos
@@ -1,4 +1,4 @@
-simulateModel("Buildings.Experimental.DHC.Loads.Cooling.Examples.BuildingTimeSeriesWithETS", startTime=2592000, stopTime=3628800, method="Cvode", tolerance=1e-06, resultFile="BuildingTimeSeriesWithETS");
+simulateModel("Buildings.DHC.Loads.Cooling.Examples.BuildingTimeSeriesWithETS", startTime=2592000, stopTime=3628800, method="Cvode", tolerance=1e-06, resultFile="BuildingTimeSeriesWithETS");
 createPlot(id=1, position={11, 19, 713, 558}, y={"buiWitETS.bui.loa.y[1]", "buiWitETS.ets.Q_flow"}, range={30.0, 42.0, -30.0, 10.0}, grid=true, subPlot=101, colors={{28,108,200}, {238,46,47}}, timeUnit="d", displayUnits={"kW", "kW"});
 createPlot(id=1, position={11, 19, 713, 558}, y={"senMasFlo.m_flow", "buiWitETS.ets.senMasFlo.m_flow"}, range={30.0, 42.0, -0.1, 0.4}, grid=true, subPlot=102, colors={{28,108,200}, {238,46,47}}, timeUnit="d", displayUnits={"kg/s", "kg/s"});
 createPlot(id=2, position={211, 7, 1250, 715}, y={"supChiWat.T", "buiWitETS.ets.senTDisSup.T", "buiWitETS.ets.senTDisRet.T", "buiWitETS.ets.senTBuiSup.T"}, range={30.0, 42.0, 6.0, 24.0}, grid=true, colors={{28,108,200}, {238,46,47}, {0,140,72}, {217,67,180}}, timeUnit="d", displayUnits={"degC", "degC", "degC", "degC"});
diff --git a/Buildings/Resources/Scripts/Dymola/Experimental/DHC/Loads/Heating/Examples/BuildingTimeSeriesWithETS.mos b/Buildings/Resources/Scripts/Dymola/DHC/Loads/Heating/Examples/BuildingTimeSeriesWithETS.mos
similarity index 77%
rename from Buildings/Resources/Scripts/Dymola/Experimental/DHC/Loads/Heating/Examples/BuildingTimeSeriesWithETS.mos
rename to Buildings/Resources/Scripts/Dymola/DHC/Loads/Heating/Examples/BuildingTimeSeriesWithETS.mos
index b3c2278d44c..2a1a9a88c4f 100644
--- a/Buildings/Resources/Scripts/Dymola/Experimental/DHC/Loads/Heating/Examples/BuildingTimeSeriesWithETS.mos
+++ b/Buildings/Resources/Scripts/Dymola/DHC/Loads/Heating/Examples/BuildingTimeSeriesWithETS.mos
@@ -1,4 +1,4 @@
-simulateModel("Buildings.Experimental.DHC.Loads.Heating.Examples.BuildingTimeSeriesWithETS", startTime=2592000, stopTime=3628800, method="Cvode", tolerance=1e-06, resultFile="BuildingTimeSeriesWithETS");
+simulateModel("Buildings.DHC.Loads.Heating.Examples.BuildingTimeSeriesWithETS", startTime=2592000, stopTime=3628800, method="Cvode", tolerance=1e-06, resultFile="BuildingTimeSeriesWithETS");
 createPlot(id=1, position={11, 19, 713, 558}, y={"buiWitETS.bui.loa.y[2]", "buiWitETS.ets.Q_flow"}, range={30.0, 42.0, -30.0, 10.0}, grid=true, subPlot=101, colors={{28,108,200}, {238,46,47}}, timeUnit="d", displayUnits={"kW", "kW"});
 createPlot(id=1, position={11, 19, 713, 558}, y={"senMasFlo.m_flow", "buiWitETS.ets.senMasFlo.m_flow"}, range={30.0, 42.0, -0.1, 0.4}, grid=true, subPlot=102, colors={{28,108,200}, {238,46,47}}, timeUnit="d", displayUnits={"kg/s", "kg/s"});
 createPlot(id=2, position={211, 7, 1250, 715}, y={"buiWitETS.ets.senTDisSup.T", "buiWitETS.ets.senTDisRet.T"}, range={30.0, 42.0, 6.0, 24.0}, grid=true, colors={{238,46,47}, {0,140,72}}, timeUnit="d", displayUnits={"degC", "degC"});
\ No newline at end of file
diff --git a/Buildings/Resources/Scripts/Dymola/Experimental/DHC/Loads/HotWater/Examples/HeaterAndFixtureDirectHeatExchangerWithElectricHeat.mos b/Buildings/Resources/Scripts/Dymola/DHC/Loads/HotWater/Examples/HeaterAndFixtureDirectHeatExchangerWithElectricHeat.mos
similarity index 75%
rename from Buildings/Resources/Scripts/Dymola/Experimental/DHC/Loads/HotWater/Examples/HeaterAndFixtureDirectHeatExchangerWithElectricHeat.mos
rename to Buildings/Resources/Scripts/Dymola/DHC/Loads/HotWater/Examples/HeaterAndFixtureDirectHeatExchangerWithElectricHeat.mos
index 577826ef250..460edc68649 100644
--- a/Buildings/Resources/Scripts/Dymola/Experimental/DHC/Loads/HotWater/Examples/HeaterAndFixtureDirectHeatExchangerWithElectricHeat.mos
+++ b/Buildings/Resources/Scripts/Dymola/DHC/Loads/HotWater/Examples/HeaterAndFixtureDirectHeatExchangerWithElectricHeat.mos
@@ -1,4 +1,4 @@
-simulateModel("Buildings.Experimental.DHC.Loads.HotWater.Examples.HeaterAndFixtureDirectHeatExchangerWithElectricHeat", stopTime=172800, numberOfIntervals=0, outputInterval=60, tolerance=1e-06, resultFile="HeaterAndFixtureDirectHeatExchangerWithElectricHeat");
+simulateModel("Buildings.DHC.Loads.HotWater.Examples.HeaterAndFixtureDirectHeatExchangerWithElectricHeat", stopTime=172800, numberOfIntervals=0, outputInterval=60, tolerance=1e-06, resultFile="HeaterAndFixtureDirectHeatExchangerWithElectricHeat");
 createPlot(id=1, position={560, 11, 592, 621}, y={"theMixValNoEle.conPID.y", "theMixVal.conPID.y"}, range={0.0, 900000.0, 0.7000000000000001, 1.1}, grid=true, subPlot=101, colors={{28,108,200}, {238,46,47}}, timeUnit="s");
 createPlot(id=1, position={560, 11, 592, 621}, y={"genNoEle.THexOut", "souDisHot.T"}, range={0.0, 900000.0, 290.0, 330.0}, grid=true, subPlot=102, colors={{28,108,200}, {238,46,47}}, timeUnit="s", displayUnits={"", "K"});
 createPlot(id=1, position={560, 11, 592, 621}, y={"gen.PEle", "genNoEle.PEle"}, range={0.0, 900000.0, -20000.0, 80000.0}, grid=true, subPlot=103, colors={{28,108,200}, {238,46,47}}, timeUnit="s", displayUnits={"W", "W"});
diff --git a/Buildings/Resources/Scripts/Dymola/Experimental/DHC/Loads/HotWater/Examples/StorageTankWithExternalHeatExchanger.mos b/Buildings/Resources/Scripts/Dymola/DHC/Loads/HotWater/Examples/StorageTankWithExternalHeatExchanger.mos
similarity index 85%
rename from Buildings/Resources/Scripts/Dymola/Experimental/DHC/Loads/HotWater/Examples/StorageTankWithExternalHeatExchanger.mos
rename to Buildings/Resources/Scripts/Dymola/DHC/Loads/HotWater/Examples/StorageTankWithExternalHeatExchanger.mos
index 985230bc842..4dd956b9a76 100644
--- a/Buildings/Resources/Scripts/Dymola/Experimental/DHC/Loads/HotWater/Examples/StorageTankWithExternalHeatExchanger.mos
+++ b/Buildings/Resources/Scripts/Dymola/DHC/Loads/HotWater/Examples/StorageTankWithExternalHeatExchanger.mos
@@ -1,4 +1,4 @@
-simulateModel("Buildings.Experimental.DHC.Loads.HotWater.Examples.StorageTankWithExternalHeatExchanger", stopTime=172800, tolerance=1e-06, resultFile="StorageTankWithExternalHeatExchanger");
+simulateModel("Buildings.DHC.Loads.HotWater.Examples.StorageTankWithExternalHeatExchanger", stopTime=172800, tolerance=1e-06, resultFile="StorageTankWithExternalHeatExchanger");
 createPlot(id=1, position={532, 19, 592, 614}, y={"theMixVal.TMixSet", "theMixVal.senTMix.T", "domHotWatTan.senTemHot.T", "domHotWatTan.TTanTop.T", "domHotWatTan.TTanBot.T", "domHotWatTan.conCha.TTanTopSet"}, range={0.0, 180000.0, 0.0, 60.0}, grid=true, subPlot=101, colors={{28,108,200}, {238,46,47}, {0,140,72}, {217,67,180}, {0,0,0}, {162,29,33}}, timeUnit="s", displayUnits={"degC", "degC", "degC", "degC", "degC", "degC"});
 createPlot(id=1, position={532, 19, 592, 614}, y={"hea.Q_flow"}, range={0.0, 180000.0, -500.0, 1000.0}, grid=true, subPlot=102, colors={{28,108,200}}, timeUnit="s", displayUnits={"W"});
 createPlot(id=1, position={532, 19, 592, 614}, y={"domHotWatTan.PEle"}, range={0.0, 180000.0, 0.0, 1.0}, grid=true, subPlot=103, colors={{28,108,200}}, timeUnit="s", displayUnits={"W"});
diff --git a/Buildings/Resources/Scripts/Dymola/Experimental/DHC/Loads/Steam/BaseClasses/Examples/ControlVolumeCondensation.mos b/Buildings/Resources/Scripts/Dymola/DHC/Loads/Steam/BaseClasses/Examples/ControlVolumeCondensation.mos
similarity index 78%
rename from Buildings/Resources/Scripts/Dymola/Experimental/DHC/Loads/Steam/BaseClasses/Examples/ControlVolumeCondensation.mos
rename to Buildings/Resources/Scripts/Dymola/DHC/Loads/Steam/BaseClasses/Examples/ControlVolumeCondensation.mos
index 269e6b6f8b9..075dd90a76d 100644
--- a/Buildings/Resources/Scripts/Dymola/Experimental/DHC/Loads/Steam/BaseClasses/Examples/ControlVolumeCondensation.mos
+++ b/Buildings/Resources/Scripts/Dymola/DHC/Loads/Steam/BaseClasses/Examples/ControlVolumeCondensation.mos
@@ -1,5 +1,5 @@
 // Simulate
-simulateModel("Buildings.Experimental.DHC.Loads.Steam.BaseClasses.Examples.ControlVolumeCondensation", tolerance=1e-06, stopTime=1.0, method="dassl", resultFile="ControlVolumeCondensation");
+simulateModel("Buildings.DHC.Loads.Steam.BaseClasses.Examples.ControlVolumeCondensation", tolerance=1e-06, stopTime=1.0, method="dassl", resultFile="ControlVolumeCondensation");
 // Plot
 createPlot(id=1, position={27, 10, 521, 446}, 
 	y={"volDyn.port_a.m_flow", "volSte.port_a.m_flow"}, 
diff --git a/Buildings/Resources/Scripts/Dymola/Experimental/DHC/Loads/Steam/BaseClasses/Examples/SteamTrap.mos b/Buildings/Resources/Scripts/Dymola/DHC/Loads/Steam/BaseClasses/Examples/SteamTrap.mos
similarity index 86%
rename from Buildings/Resources/Scripts/Dymola/Experimental/DHC/Loads/Steam/BaseClasses/Examples/SteamTrap.mos
rename to Buildings/Resources/Scripts/Dymola/DHC/Loads/Steam/BaseClasses/Examples/SteamTrap.mos
index ce89e6dcee7..b342dfdc76d 100644
--- a/Buildings/Resources/Scripts/Dymola/Experimental/DHC/Loads/Steam/BaseClasses/Examples/SteamTrap.mos
+++ b/Buildings/Resources/Scripts/Dymola/DHC/Loads/Steam/BaseClasses/Examples/SteamTrap.mos
@@ -1,5 +1,5 @@
 // Simulate
-simulateModel("Buildings.Experimental.DHC.Loads.Steam.BaseClasses.Examples.SteamTrap", stopTime=180, tolerance=1e-06, method="dassl", resultFile="SteamTrap");
+simulateModel("Buildings.DHC.Loads.Steam.BaseClasses.Examples.SteamTrap", stopTime=180, tolerance=1e-06, method="dassl", resultFile="SteamTrap");
 // Plot commands
 removePlots(false);
 createPlot(id=1, position={15, 15, 874, 421}, 
diff --git a/Buildings/Resources/Scripts/Dymola/Experimental/DHC/Loads/Steam/BaseClasses/Examples/ValveSelfActing.mos b/Buildings/Resources/Scripts/Dymola/DHC/Loads/Steam/BaseClasses/Examples/ValveSelfActing.mos
similarity index 82%
rename from Buildings/Resources/Scripts/Dymola/Experimental/DHC/Loads/Steam/BaseClasses/Examples/ValveSelfActing.mos
rename to Buildings/Resources/Scripts/Dymola/DHC/Loads/Steam/BaseClasses/Examples/ValveSelfActing.mos
index 5a21849cac0..53c97e609c4 100644
--- a/Buildings/Resources/Scripts/Dymola/Experimental/DHC/Loads/Steam/BaseClasses/Examples/ValveSelfActing.mos
+++ b/Buildings/Resources/Scripts/Dymola/DHC/Loads/Steam/BaseClasses/Examples/ValveSelfActing.mos
@@ -1,5 +1,5 @@
 // Simulate
-simulateModel("Buildings.Experimental.DHC.Loads.Steam.BaseClasses.Examples.ValveSelfActing", stopTime=15, method="dassl", tolerance=1e-06, resultFile="ValveSelfActing");
+simulateModel("Buildings.DHC.Loads.Steam.BaseClasses.Examples.ValveSelfActing", stopTime=15, method="dassl", tolerance=1e-06, resultFile="ValveSelfActing");
 // Plot commands
 removePlots(false);
 createPlot(id=1, position={11, 59, 631, 388}, 
diff --git a/Buildings/Resources/Scripts/Dymola/Experimental/DHC/Loads/Steam/Examples/BuildingTimeSeriesAtETS.mos b/Buildings/Resources/Scripts/Dymola/DHC/Loads/Steam/Examples/BuildingTimeSeriesAtETS.mos
similarity index 87%
rename from Buildings/Resources/Scripts/Dymola/Experimental/DHC/Loads/Steam/Examples/BuildingTimeSeriesAtETS.mos
rename to Buildings/Resources/Scripts/Dymola/DHC/Loads/Steam/Examples/BuildingTimeSeriesAtETS.mos
index 24d352c5030..4f262b02243 100644
--- a/Buildings/Resources/Scripts/Dymola/Experimental/DHC/Loads/Steam/Examples/BuildingTimeSeriesAtETS.mos
+++ b/Buildings/Resources/Scripts/Dymola/DHC/Loads/Steam/Examples/BuildingTimeSeriesAtETS.mos
@@ -1,5 +1,5 @@
 // Simulate
-simulateModel("Buildings.Experimental.DHC.Loads.Steam.Examples.BuildingTimeSeriesAtETS", startTime=1728000, stopTime=1814400, tolerance=1e-06, method="dassl", resultFile="BuildingTimeSeriesAtETS");
+simulateModel("Buildings.DHC.Loads.Steam.Examples.BuildingTimeSeriesAtETS", startTime=1728000, stopTime=1814400, tolerance=1e-06, method="dassl", resultFile="BuildingTimeSeriesAtETS");
 // Plot commands
 createPlot(id=1, position={15, 10, 624, 496}, 
 	y={"bui.Q_flow"}, 
diff --git a/Buildings/Resources/Scripts/Dymola/Experimental/DHC/Networks/Connections/Examples/Connection1PipeExample.mos b/Buildings/Resources/Scripts/Dymola/DHC/Networks/Connections/Examples/Connection1PipeExample.mos
similarity index 80%
rename from Buildings/Resources/Scripts/Dymola/Experimental/DHC/Networks/Connections/Examples/Connection1PipeExample.mos
rename to Buildings/Resources/Scripts/Dymola/DHC/Networks/Connections/Examples/Connection1PipeExample.mos
index 863231c1433..12117facbcc 100644
--- a/Buildings/Resources/Scripts/Dymola/Experimental/DHC/Networks/Connections/Examples/Connection1PipeExample.mos
+++ b/Buildings/Resources/Scripts/Dymola/DHC/Networks/Connections/Examples/Connection1PipeExample.mos
@@ -1,5 +1,5 @@
 // Simulate
-simulateModel("Buildings.Experimental.DHC.Networks.Connections.Examples.Connection1PipeExample", stopTime=3600,method="Cvode", tolerance=1e-06, resultFile="Connection1PipeExample");
+simulateModel("Buildings.DHC.Networks.Connections.Examples.Connection1PipeExample", stopTime=3600,method="Cvode", tolerance=1e-06, resultFile="Connection1PipeExample");
 // Plot commands
 createPlot(id=1, position={52, 10, 1644, 1131}, y={"pumDisPipe_R.m_flow_actual", "pumDisPlugFlow.m_flow_actual","pumConPipe_R.m_flow_actual", "pumConPlugFlow.m_flow_actual"}, range={0.0, 3600.0, -0.2, 1.2000000000000002}, autoscale=false, grid=true, subPlot=101, colors={{28,108,200}, {238,46,47}, {0,140,72}, {217,67,180}}, timeUnit="s", displayUnits={"kg/s", "kg/s", "kg/s", "kg/s"});
 createPlot(id=1, position={52, 10, 1644, 1131}, y={"pumDisPipe_R.port_a.p", "pumDisPipe_R.port_b.p", "pumDisPlugFlow.port_a.p", "pumDisPlugFlow.port_b.p"}, range={0.0, 3600.0, 2.0, 3.1}, autoscale=false, grid=true, subPlot=102, colors={{28,108,200}, {238,46,47}, {0,140,72}, {217,67,180}}, timeUnit="s", displayUnits={"bar", "bar", "bar", "bar"});
diff --git a/Buildings/Resources/Scripts/Dymola/Experimental/DHC/Networks/Connections/Examples/Connection2PipeExample.mos b/Buildings/Resources/Scripts/Dymola/DHC/Networks/Connections/Examples/Connection2PipeExample.mos
similarity index 80%
rename from Buildings/Resources/Scripts/Dymola/Experimental/DHC/Networks/Connections/Examples/Connection2PipeExample.mos
rename to Buildings/Resources/Scripts/Dymola/DHC/Networks/Connections/Examples/Connection2PipeExample.mos
index 1a66e4fcdfb..403e5a5211b 100644
--- a/Buildings/Resources/Scripts/Dymola/Experimental/DHC/Networks/Connections/Examples/Connection2PipeExample.mos
+++ b/Buildings/Resources/Scripts/Dymola/DHC/Networks/Connections/Examples/Connection2PipeExample.mos
@@ -1,5 +1,5 @@
 // Simulate
-simulateModel("Buildings.Experimental.DHC.Networks.Connections.Examples.Connection2PipeExample", stopTime=3600,method="Cvode", tolerance=1e-06, resultFile="Connection2PipeExample");
+simulateModel("Buildings.DHC.Networks.Connections.Examples.Connection2PipeExample", stopTime=3600,method="Cvode", tolerance=1e-06, resultFile="Connection2PipeExample");
 // Plot commands
 createPlot(id=1, position={52, 10, 1644, 1131}, y={"pumDisPipe_R.m_flow_actual", "pumDisPlugFlow.m_flow_actual","pumConPipe_R.m_flow_actual", "pumConPlugFlow.m_flow_actual"}, range={0.0, 3600.0, -0.2, 1.2000000000000002}, autoscale=false, grid=true, subPlot=101, colors={{28,108,200}, {238,46,47}, {0,140,72}, {217,67,180}}, timeUnit="s", displayUnits={"kg/s", "kg/s", "kg/s", "kg/s"});
 createPlot(id=1, position={52, 10, 1644, 1131}, y={"pumDisPipe_R.port_a.p", "pumDisPipe_R.port_b.p", "pumDisPlugFlow.port_a.p", "pumDisPlugFlow.port_b.p"}, range={0.0, 3600.0, 2.0, 3.1}, autoscale=false, grid=true, subPlot=102, colors={{28,108,200}, {238,46,47}, {0,140,72}, {217,67,180}}, timeUnit="s", displayUnits={"bar", "bar", "bar", "bar"});
diff --git a/Buildings/Resources/Scripts/Dymola/Experimental/DHC/Networks/Controls/Examples/AgentPump1PipeExample.mos b/Buildings/Resources/Scripts/Dymola/DHC/Networks/Controls/Examples/AgentPump1PipeExample.mos
similarity index 76%
rename from Buildings/Resources/Scripts/Dymola/Experimental/DHC/Networks/Controls/Examples/AgentPump1PipeExample.mos
rename to Buildings/Resources/Scripts/Dymola/DHC/Networks/Controls/Examples/AgentPump1PipeExample.mos
index 3c9d92753a8..f2bbf8e2202 100644
--- a/Buildings/Resources/Scripts/Dymola/Experimental/DHC/Networks/Controls/Examples/AgentPump1PipeExample.mos
+++ b/Buildings/Resources/Scripts/Dymola/DHC/Networks/Controls/Examples/AgentPump1PipeExample.mos
@@ -1,5 +1,5 @@
 // Simulate
-simulateModel("Buildings.Experimental.DHC.Networks.Controls.Examples.AgentPump1PipeExample", stopTime=3600,method="Cvode", tolerance=1e-06, resultFile="AgentPump1PipeExample");
+simulateModel("Buildings.DHC.Networks.Controls.Examples.AgentPump1PipeExample", stopTime=3600,method="Cvode", tolerance=1e-06, resultFile="AgentPump1PipeExample");
 // Plot commands
 createPlot(id=1, position={55, 55, 1174, 550}, y={"AgentPump.TSouIn", "AgentPump.TSouOut", "AgentPump.TSou", "AgentPump.TSupDis", "AgentPump.TRetDis"}, range={0.0, 3600.0, 6.0, 14.0}, autoscale=false, grid=true, subPlot=101, colors={{28,108,200}, {238,46,47}, {0,140,72}, {217,67,180}, {0,0,0}}, timeUnit="s", displayUnits={"degC", "degC", "degC", "degC", "degC"});
 createPlot(id=1, position={55, 55, 1174, 550}, y={"AgentPump.y"}, range={0.0, 3600.0, -0.1, 0.6000000000000001}, grid=true, subPlot=102, colors={{28,108,200}}, timeUnit="s", displayUnits={"1"});
diff --git a/Buildings/Resources/Scripts/Dymola/Experimental/DHC/Networks/Controls/Examples/MainPump1PipeExample.mos b/Buildings/Resources/Scripts/Dymola/DHC/Networks/Controls/Examples/MainPump1PipeExample.mos
similarity index 81%
rename from Buildings/Resources/Scripts/Dymola/Experimental/DHC/Networks/Controls/Examples/MainPump1PipeExample.mos
rename to Buildings/Resources/Scripts/Dymola/DHC/Networks/Controls/Examples/MainPump1PipeExample.mos
index 4e86b58947b..fee045bdbcb 100644
--- a/Buildings/Resources/Scripts/Dymola/Experimental/DHC/Networks/Controls/Examples/MainPump1PipeExample.mos
+++ b/Buildings/Resources/Scripts/Dymola/DHC/Networks/Controls/Examples/MainPump1PipeExample.mos
@@ -1,5 +1,5 @@
 // Simulate
-simulateModel("Buildings.Experimental.DHC.Networks.Controls.Examples.MainPump1PipeExample", stopTime=3600,method="Cvode", tolerance=1e-06, resultFile="MainPump1PipeExample");
+simulateModel("Buildings.DHC.Networks.Controls.Examples.MainPump1PipeExample", stopTime=3600,method="Cvode", tolerance=1e-06, resultFile="MainPump1PipeExample");
 // Plot commands
 createPlot(id=1, position={55, 55, 1212, 838}, y={"conPum.TMix[1]", "conPum.TSouIn[1]", "conPum.TSouOut[1]", "conPum.TMin_lower.y", "conPum.TMax_upper.y"}, range={0.0, 3600.0, 0.0, 20.0}, grid=true, subPlot=101, colors={{28,108,200}, {238,46,47}, {0,140,72}, {217,67,180}, {0,0,0}}, timeUnit="s", displayUnits={"degC", "degC", "degC", "degC", "degC"});
 createPlot(id=1, position={55, 55, 1212, 838}, y={"conPum.QCoo_flow[1]"}, range={0.0, 3600.0, -100.0, 600.0}, grid=true, subPlot=102, colors={{28,108,200}}, timeUnit="s", displayUnits={"W"});
diff --git a/Buildings/Resources/Scripts/Dymola/Experimental/DHC/Networks/Examples/Distribution1PipeExample.mos b/Buildings/Resources/Scripts/Dymola/DHC/Networks/Examples/Distribution1PipeExample.mos
similarity index 82%
rename from Buildings/Resources/Scripts/Dymola/Experimental/DHC/Networks/Examples/Distribution1PipeExample.mos
rename to Buildings/Resources/Scripts/Dymola/DHC/Networks/Examples/Distribution1PipeExample.mos
index e3aa6d2675b..f596246d6cd 100644
--- a/Buildings/Resources/Scripts/Dymola/Experimental/DHC/Networks/Examples/Distribution1PipeExample.mos
+++ b/Buildings/Resources/Scripts/Dymola/DHC/Networks/Examples/Distribution1PipeExample.mos
@@ -1,5 +1,5 @@
 // Simulate
-simulateModel("Buildings.Experimental.DHC.Networks.Examples.Distribution1PipeExample", stopTime=3600,method="Cvode", tolerance=1e-06, resultFile="Distribution1PipeExample");
+simulateModel("Buildings.DHC.Networks.Examples.Distribution1PipeExample", stopTime=3600,method="Cvode", tolerance=1e-06, resultFile="Distribution1PipeExample");
 // Plot commands
 createPlot( id=1,position={1, 20, 492, 682},  y={"terAutoSize[1].TLoaODE.TAir", "minTSet.y"}, grid=true, color=true, displayUnits={"degC", "degC"});
 createPlot( id=1,y={"terAutoSize[1].QReqHea_flow", "terAutoSize[1].QActHea_flow"},grid=true,color=true, subPlot=2);
diff --git a/Buildings/Resources/Scripts/Dymola/Experimental/DHC/Networks/Examples/Distribution2PipeExample.mos b/Buildings/Resources/Scripts/Dymola/DHC/Networks/Examples/Distribution2PipeExample.mos
similarity index 82%
rename from Buildings/Resources/Scripts/Dymola/Experimental/DHC/Networks/Examples/Distribution2PipeExample.mos
rename to Buildings/Resources/Scripts/Dymola/DHC/Networks/Examples/Distribution2PipeExample.mos
index b3dd6ed8066..6a1b3a0835c 100644
--- a/Buildings/Resources/Scripts/Dymola/Experimental/DHC/Networks/Examples/Distribution2PipeExample.mos
+++ b/Buildings/Resources/Scripts/Dymola/DHC/Networks/Examples/Distribution2PipeExample.mos
@@ -1,5 +1,5 @@
 // Simulate
-simulateModel("Buildings.Experimental.DHC.Networks.Examples.Distribution2PipeExample", stopTime=3600,method="Cvode", tolerance=1e-06, resultFile="Distribution2PipeExample");
+simulateModel("Buildings.DHC.Networks.Examples.Distribution2PipeExample", stopTime=3600,method="Cvode", tolerance=1e-06, resultFile="Distribution2PipeExample");
 // Plot commands
 createPlot( id=1,position={1, 20, 492, 682},  y={"terAutoSize[1].TLoaODE.TAir", "minTSet.y"}, grid=true, color=true, displayUnits={"degC", "degC"});
 createPlot( id=1,y={"terAutoSize[1].QReqHea_flow", "terAutoSize[1].QActHea_flow"},grid=true,color=true, subPlot=2);
diff --git a/Buildings/Resources/Scripts/Dymola/Experimental/DHC/Networks/Pipes/Validation/Pipe.mos b/Buildings/Resources/Scripts/Dymola/DHC/Networks/Pipes/Validation/Pipe.mos
similarity index 93%
rename from Buildings/Resources/Scripts/Dymola/Experimental/DHC/Networks/Pipes/Validation/Pipe.mos
rename to Buildings/Resources/Scripts/Dymola/DHC/Networks/Pipes/Validation/Pipe.mos
index dfdaea24f75..978feb257ab 100644
--- a/Buildings/Resources/Scripts/Dymola/Experimental/DHC/Networks/Pipes/Validation/Pipe.mos
+++ b/Buildings/Resources/Scripts/Dymola/DHC/Networks/Pipes/Validation/Pipe.mos
@@ -1,5 +1,5 @@
 // Simulate
-simulateModel("Buildings.Experimental.DHC.Networks.Pipes.Validation.Pipe", 
+simulateModel("Buildings.DHC.Networks.Pipes.Validation.Pipe", 
     stopTime=1, 
     method="Cvode", 
     tolerance=1e-06,
diff --git a/Buildings/Resources/Scripts/Dymola/Experimental/DHC/Networks/Steam/Examples/ConnectionCondensatePipe.mos b/Buildings/Resources/Scripts/Dymola/DHC/Networks/Steam/Examples/ConnectionCondensatePipe.mos
similarity index 78%
rename from Buildings/Resources/Scripts/Dymola/Experimental/DHC/Networks/Steam/Examples/ConnectionCondensatePipe.mos
rename to Buildings/Resources/Scripts/Dymola/DHC/Networks/Steam/Examples/ConnectionCondensatePipe.mos
index 45f44313936..20bb80e346c 100644
--- a/Buildings/Resources/Scripts/Dymola/Experimental/DHC/Networks/Steam/Examples/ConnectionCondensatePipe.mos
+++ b/Buildings/Resources/Scripts/Dymola/DHC/Networks/Steam/Examples/ConnectionCondensatePipe.mos
@@ -1,5 +1,5 @@
 // Simulate
-simulateModel("Buildings.Experimental.DHC.Networks.Steam.Examples.ConnectionCondensatePipe", stopTime=86400, tolerance=1e-6, method="dassl", resultFile="ConnectionCondensatePipe");
+simulateModel("Buildings.DHC.Networks.Steam.Examples.ConnectionCondensatePipe", stopTime=86400, tolerance=1e-6, method="dassl", resultFile="ConnectionCondensatePipe");
 // Plot commands
 createPlot(id=1, position={26, 43, 764, 418}, 
   y={"con.port_aDisSup.m_flow", "con.port_bDisRet.m_flow"}, 
diff --git a/Buildings/Resources/Scripts/Dymola/Experimental/DHC/Networks/Steam/Examples/DistributionCondensatePipe.mos b/Buildings/Resources/Scripts/Dymola/DHC/Networks/Steam/Examples/DistributionCondensatePipe.mos
similarity index 90%
rename from Buildings/Resources/Scripts/Dymola/Experimental/DHC/Networks/Steam/Examples/DistributionCondensatePipe.mos
rename to Buildings/Resources/Scripts/Dymola/DHC/Networks/Steam/Examples/DistributionCondensatePipe.mos
index cd16e5bae5b..720f8e69b8b 100644
--- a/Buildings/Resources/Scripts/Dymola/Experimental/DHC/Networks/Steam/Examples/DistributionCondensatePipe.mos
+++ b/Buildings/Resources/Scripts/Dymola/DHC/Networks/Steam/Examples/DistributionCondensatePipe.mos
@@ -1,5 +1,5 @@
 // Simulate
-simulateModel("Buildings.Experimental.DHC.Networks.Steam.Examples.DistributionCondensatePipe", stopTime=86400, tolerance=1e-6, method="dassl", resultFile="DistributionCondensatePipe");
+simulateModel("Buildings.DHC.Networks.Steam.Examples.DistributionCondensatePipe", stopTime=86400, tolerance=1e-6, method="dassl", resultFile="DistributionCondensatePipe");
 // Plot commands
 createPlot(id=1, position={26, 51, 1285, 632}, 
   y={"dis.ports_aCon[1].m_flow", "dis.ports_aCon[2].m_flow"}, 
diff --git a/Buildings/Resources/Scripts/Dymola/Experimental/DHC/Plants/Combined/Controls/BaseClasses/Validation/StageIndex.mos b/Buildings/Resources/Scripts/Dymola/DHC/Plants/Combined/Controls/BaseClasses/Validation/StageIndex.mos
similarity index 81%
rename from Buildings/Resources/Scripts/Dymola/Experimental/DHC/Plants/Combined/Controls/BaseClasses/Validation/StageIndex.mos
rename to Buildings/Resources/Scripts/Dymola/DHC/Plants/Combined/Controls/BaseClasses/Validation/StageIndex.mos
index 1fd71036b50..a3fd1857b98 100644
--- a/Buildings/Resources/Scripts/Dymola/Experimental/DHC/Plants/Combined/Controls/BaseClasses/Validation/StageIndex.mos
+++ b/Buildings/Resources/Scripts/Dymola/DHC/Plants/Combined/Controls/BaseClasses/Validation/StageIndex.mos
@@ -1,4 +1,4 @@
-simulateModel("Buildings.Experimental.DHC.Plants.Combined.Controls.BaseClasses.Validation.StageIndex",
+simulateModel("Buildings.DHC.Plants.Combined.Controls.BaseClasses.Validation.StageIndex",
     method="Cvode",
     tolerance=1e-6,
     startTime=0,
diff --git a/Buildings/Resources/Scripts/Dymola/Experimental/DHC/Plants/Combined/Controls/BaseClasses/Validation/StagingPlant.mos b/Buildings/Resources/Scripts/Dymola/DHC/Plants/Combined/Controls/BaseClasses/Validation/StagingPlant.mos
similarity index 92%
rename from Buildings/Resources/Scripts/Dymola/Experimental/DHC/Plants/Combined/Controls/BaseClasses/Validation/StagingPlant.mos
rename to Buildings/Resources/Scripts/Dymola/DHC/Plants/Combined/Controls/BaseClasses/Validation/StagingPlant.mos
index c12e851d111..8dea391fb79 100644
--- a/Buildings/Resources/Scripts/Dymola/Experimental/DHC/Plants/Combined/Controls/BaseClasses/Validation/StagingPlant.mos
+++ b/Buildings/Resources/Scripts/Dymola/DHC/Plants/Combined/Controls/BaseClasses/Validation/StagingPlant.mos
@@ -1,4 +1,4 @@
-simulateModel("Buildings.Experimental.DHC.Plants.Combined.Controls.BaseClasses.Validation.StagingPlant",
+simulateModel("Buildings.DHC.Plants.Combined.Controls.BaseClasses.Validation.StagingPlant",
     method="Cvode",
     tolerance=1e-6,
     startTime=0,
diff --git a/Buildings/Resources/Scripts/Dymola/Experimental/DHC/Plants/Combined/Controls/BaseClasses/Validation/StagingPump.mos b/Buildings/Resources/Scripts/Dymola/DHC/Plants/Combined/Controls/BaseClasses/Validation/StagingPump.mos
similarity index 85%
rename from Buildings/Resources/Scripts/Dymola/Experimental/DHC/Plants/Combined/Controls/BaseClasses/Validation/StagingPump.mos
rename to Buildings/Resources/Scripts/Dymola/DHC/Plants/Combined/Controls/BaseClasses/Validation/StagingPump.mos
index b628097b586..b8e604d9dcb 100644
--- a/Buildings/Resources/Scripts/Dymola/Experimental/DHC/Plants/Combined/Controls/BaseClasses/Validation/StagingPump.mos
+++ b/Buildings/Resources/Scripts/Dymola/DHC/Plants/Combined/Controls/BaseClasses/Validation/StagingPump.mos
@@ -1,4 +1,4 @@
-simulateModel("Buildings.Experimental.DHC.Plants.Combined.Controls.BaseClasses.Validation.StagingPump",
+simulateModel("Buildings.DHC.Plants.Combined.Controls.BaseClasses.Validation.StagingPump",
     method="Cvode",
     tolerance=1e-6,
     startTime=0,
diff --git a/Buildings/Resources/Scripts/Dymola/Experimental/DHC/Plants/Combined/Examples/AllElectricCWStorage.mos b/Buildings/Resources/Scripts/Dymola/DHC/Plants/Combined/Examples/AllElectricCWStorage.mos
similarity index 94%
rename from Buildings/Resources/Scripts/Dymola/Experimental/DHC/Plants/Combined/Examples/AllElectricCWStorage.mos
rename to Buildings/Resources/Scripts/Dymola/DHC/Plants/Combined/Examples/AllElectricCWStorage.mos
index acbcadaac02..d6508f44a04 100644
--- a/Buildings/Resources/Scripts/Dymola/Experimental/DHC/Plants/Combined/Examples/AllElectricCWStorage.mos
+++ b/Buildings/Resources/Scripts/Dymola/DHC/Plants/Combined/Examples/AllElectricCWStorage.mos
@@ -1,4 +1,4 @@
-simulateModel("Buildings.Experimental.DHC.Plants.Combined.Examples.AllElectricCWStorage",
+simulateModel("Buildings.DHC.Plants.Combined.Examples.AllElectricCWStorage",
     method="Radau",
     tolerance=1e-6,
     startTime=3024000,
diff --git a/Buildings/Resources/Scripts/Dymola/Experimental/DHC/Plants/Combined/Subsystems/Validation/ChillerGroup.mos b/Buildings/Resources/Scripts/Dymola/DHC/Plants/Combined/Subsystems/Validation/ChillerGroup.mos
similarity index 90%
rename from Buildings/Resources/Scripts/Dymola/Experimental/DHC/Plants/Combined/Subsystems/Validation/ChillerGroup.mos
rename to Buildings/Resources/Scripts/Dymola/DHC/Plants/Combined/Subsystems/Validation/ChillerGroup.mos
index 02a151a3e7e..b6ffeb11e45 100644
--- a/Buildings/Resources/Scripts/Dymola/Experimental/DHC/Plants/Combined/Subsystems/Validation/ChillerGroup.mos
+++ b/Buildings/Resources/Scripts/Dymola/DHC/Plants/Combined/Subsystems/Validation/ChillerGroup.mos
@@ -1,4 +1,4 @@
-simulateModel("Buildings.Experimental.DHC.Plants.Combined.Subsystems.Validation.ChillerGroup",
+simulateModel("Buildings.DHC.Plants.Combined.Subsystems.Validation.ChillerGroup",
     method="Cvode",
     tolerance=1e-6,
     startTime=0,
diff --git a/Buildings/Resources/Scripts/Dymola/Experimental/DHC/Plants/Combined/Subsystems/Validation/ChillerHeatRecoveryGroup.mos b/Buildings/Resources/Scripts/Dymola/DHC/Plants/Combined/Subsystems/Validation/ChillerHeatRecoveryGroup.mos
similarity index 95%
rename from Buildings/Resources/Scripts/Dymola/Experimental/DHC/Plants/Combined/Subsystems/Validation/ChillerHeatRecoveryGroup.mos
rename to Buildings/Resources/Scripts/Dymola/DHC/Plants/Combined/Subsystems/Validation/ChillerHeatRecoveryGroup.mos
index d17ab9478ea..80030c12319 100644
--- a/Buildings/Resources/Scripts/Dymola/Experimental/DHC/Plants/Combined/Subsystems/Validation/ChillerHeatRecoveryGroup.mos
+++ b/Buildings/Resources/Scripts/Dymola/DHC/Plants/Combined/Subsystems/Validation/ChillerHeatRecoveryGroup.mos
@@ -1,4 +1,4 @@
-simulateModel("Buildings.Experimental.DHC.Plants.Combined.Subsystems.Validation.ChillerHeatRecoveryGroup",
+simulateModel("Buildings.DHC.Plants.Combined.Subsystems.Validation.ChillerHeatRecoveryGroup",
     method="Cvode",
     tolerance=1e-6,
     startTime=0,
diff --git a/Buildings/Resources/Scripts/Dymola/Experimental/DHC/Plants/Combined/Subsystems/Validation/CoolingTowerGroup.mos b/Buildings/Resources/Scripts/Dymola/DHC/Plants/Combined/Subsystems/Validation/CoolingTowerGroup.mos
similarity index 89%
rename from Buildings/Resources/Scripts/Dymola/Experimental/DHC/Plants/Combined/Subsystems/Validation/CoolingTowerGroup.mos
rename to Buildings/Resources/Scripts/Dymola/DHC/Plants/Combined/Subsystems/Validation/CoolingTowerGroup.mos
index fce32ca5208..d6df05805f2 100644
--- a/Buildings/Resources/Scripts/Dymola/Experimental/DHC/Plants/Combined/Subsystems/Validation/CoolingTowerGroup.mos
+++ b/Buildings/Resources/Scripts/Dymola/DHC/Plants/Combined/Subsystems/Validation/CoolingTowerGroup.mos
@@ -1,4 +1,4 @@
-simulateModel("Buildings.Experimental.DHC.Plants.Combined.Subsystems.Validation.CoolingTowerGroup",
+simulateModel("Buildings.DHC.Plants.Combined.Subsystems.Validation.CoolingTowerGroup",
     method="Cvode",
     tolerance=1e-6,
     startTime=0,
diff --git a/Buildings/Resources/Scripts/Dymola/Experimental/DHC/Plants/Combined/Subsystems/Validation/HeatPumpGroup.mos b/Buildings/Resources/Scripts/Dymola/DHC/Plants/Combined/Subsystems/Validation/HeatPumpGroup.mos
similarity index 90%
rename from Buildings/Resources/Scripts/Dymola/Experimental/DHC/Plants/Combined/Subsystems/Validation/HeatPumpGroup.mos
rename to Buildings/Resources/Scripts/Dymola/DHC/Plants/Combined/Subsystems/Validation/HeatPumpGroup.mos
index 5adb5c66dde..eed5b914f3b 100644
--- a/Buildings/Resources/Scripts/Dymola/Experimental/DHC/Plants/Combined/Subsystems/Validation/HeatPumpGroup.mos
+++ b/Buildings/Resources/Scripts/Dymola/DHC/Plants/Combined/Subsystems/Validation/HeatPumpGroup.mos
@@ -1,4 +1,4 @@
-simulateModel("Buildings.Experimental.DHC.Plants.Combined.Subsystems.Validation.HeatPumpGroup",
+simulateModel("Buildings.DHC.Plants.Combined.Subsystems.Validation.HeatPumpGroup",
     method="Cvode",
     tolerance=1e-6,
     startTime=0,
diff --git a/Buildings/Resources/Scripts/Dymola/Experimental/DHC/Plants/Combined/Subsystems/Validation/MultiplePumpsDp.mos b/Buildings/Resources/Scripts/Dymola/DHC/Plants/Combined/Subsystems/Validation/MultiplePumpsDp.mos
similarity index 90%
rename from Buildings/Resources/Scripts/Dymola/Experimental/DHC/Plants/Combined/Subsystems/Validation/MultiplePumpsDp.mos
rename to Buildings/Resources/Scripts/Dymola/DHC/Plants/Combined/Subsystems/Validation/MultiplePumpsDp.mos
index 4be87254d08..912a871293c 100644
--- a/Buildings/Resources/Scripts/Dymola/Experimental/DHC/Plants/Combined/Subsystems/Validation/MultiplePumpsDp.mos
+++ b/Buildings/Resources/Scripts/Dymola/DHC/Plants/Combined/Subsystems/Validation/MultiplePumpsDp.mos
@@ -1,4 +1,4 @@
-simulateModel("Buildings.Experimental.DHC.Plants.Combined.Subsystems.Validation.MultiplePumpsDp",
+simulateModel("Buildings.DHC.Plants.Combined.Subsystems.Validation.MultiplePumpsDp",
     method="Cvode",
     tolerance=1e-6,
     startTime=0,
diff --git a/Buildings/Resources/Scripts/Dymola/Experimental/DHC/Plants/Combined/Subsystems/Validation/MultiplePumpsFlow.mos b/Buildings/Resources/Scripts/Dymola/DHC/Plants/Combined/Subsystems/Validation/MultiplePumpsFlow.mos
similarity index 90%
rename from Buildings/Resources/Scripts/Dymola/Experimental/DHC/Plants/Combined/Subsystems/Validation/MultiplePumpsFlow.mos
rename to Buildings/Resources/Scripts/Dymola/DHC/Plants/Combined/Subsystems/Validation/MultiplePumpsFlow.mos
index e975b2fd4d7..c7e8cbfe064 100644
--- a/Buildings/Resources/Scripts/Dymola/Experimental/DHC/Plants/Combined/Subsystems/Validation/MultiplePumpsFlow.mos
+++ b/Buildings/Resources/Scripts/Dymola/DHC/Plants/Combined/Subsystems/Validation/MultiplePumpsFlow.mos
@@ -1,4 +1,4 @@
-simulateModel("Buildings.Experimental.DHC.Plants.Combined.Subsystems.Validation.MultiplePumpsFlow",
+simulateModel("Buildings.DHC.Plants.Combined.Subsystems.Validation.MultiplePumpsFlow",
     method="Cvode",
     tolerance=1e-6,
     startTime=0,
diff --git a/Buildings/Resources/Scripts/Dymola/Experimental/DHC/Plants/Combined/Subsystems/Validation/MultiplePumpsSpeed.mos b/Buildings/Resources/Scripts/Dymola/DHC/Plants/Combined/Subsystems/Validation/MultiplePumpsSpeed.mos
similarity index 90%
rename from Buildings/Resources/Scripts/Dymola/Experimental/DHC/Plants/Combined/Subsystems/Validation/MultiplePumpsSpeed.mos
rename to Buildings/Resources/Scripts/Dymola/DHC/Plants/Combined/Subsystems/Validation/MultiplePumpsSpeed.mos
index 6ff9145656b..891f4a85c3b 100644
--- a/Buildings/Resources/Scripts/Dymola/Experimental/DHC/Plants/Combined/Subsystems/Validation/MultiplePumpsSpeed.mos
+++ b/Buildings/Resources/Scripts/Dymola/DHC/Plants/Combined/Subsystems/Validation/MultiplePumpsSpeed.mos
@@ -1,4 +1,4 @@
-simulateModel("Buildings.Experimental.DHC.Plants.Combined.Subsystems.Validation.MultiplePumpsSpeed",
+simulateModel("Buildings.DHC.Plants.Combined.Subsystems.Validation.MultiplePumpsSpeed",
     method="Cvode",
     tolerance=1e-6,
     startTime=0,
diff --git a/Buildings/Resources/Scripts/Dymola/Experimental/DHC/Plants/Combined/Subsystems/Validation/ValveOpeningFlowBalancing.mos b/Buildings/Resources/Scripts/Dymola/DHC/Plants/Combined/Subsystems/Validation/ValveOpeningFlowBalancing.mos
similarity index 84%
rename from Buildings/Resources/Scripts/Dymola/Experimental/DHC/Plants/Combined/Subsystems/Validation/ValveOpeningFlowBalancing.mos
rename to Buildings/Resources/Scripts/Dymola/DHC/Plants/Combined/Subsystems/Validation/ValveOpeningFlowBalancing.mos
index eb2c2466bf5..06b5e3118ad 100644
--- a/Buildings/Resources/Scripts/Dymola/Experimental/DHC/Plants/Combined/Subsystems/Validation/ValveOpeningFlowBalancing.mos
+++ b/Buildings/Resources/Scripts/Dymola/DHC/Plants/Combined/Subsystems/Validation/ValveOpeningFlowBalancing.mos
@@ -1,4 +1,4 @@
-simulateModel("Buildings.Experimental.DHC.Plants.Combined.Subsystems.Validation.ValveOpeningFlowBalancing",
+simulateModel("Buildings.DHC.Plants.Combined.Subsystems.Validation.ValveOpeningFlowBalancing",
     method="Cvode",
     tolerance=1e-6,
     startTime=0,
diff --git a/Buildings/Resources/Scripts/Dymola/Experimental/DHC/Plants/Combined/Validation/AllElectricCWStorage.mos b/Buildings/Resources/Scripts/Dymola/DHC/Plants/Combined/Validation/AllElectricCWStorage.mos
similarity index 98%
rename from Buildings/Resources/Scripts/Dymola/Experimental/DHC/Plants/Combined/Validation/AllElectricCWStorage.mos
rename to Buildings/Resources/Scripts/Dymola/DHC/Plants/Combined/Validation/AllElectricCWStorage.mos
index b8cd7757fb6..a80ca79a0e7 100644
--- a/Buildings/Resources/Scripts/Dymola/Experimental/DHC/Plants/Combined/Validation/AllElectricCWStorage.mos
+++ b/Buildings/Resources/Scripts/Dymola/DHC/Plants/Combined/Validation/AllElectricCWStorage.mos
@@ -1,4 +1,4 @@
-simulateModel("Buildings.Experimental.DHC.Plants.Combined.Validation.AllElectricCWStorage",
+simulateModel("Buildings.DHC.Plants.Combined.Validation.AllElectricCWStorage",
     method="Cvode",
     tolerance=1e-6,
     startTime=0,
diff --git a/Buildings/Resources/Scripts/Dymola/Experimental/DHC/Plants/Cooling/BaseClasses/Validation/IdealUser.mos b/Buildings/Resources/Scripts/Dymola/DHC/Plants/Cooling/BaseClasses/Validation/IdealUser.mos
similarity index 85%
rename from Buildings/Resources/Scripts/Dymola/Experimental/DHC/Plants/Cooling/BaseClasses/Validation/IdealUser.mos
rename to Buildings/Resources/Scripts/Dymola/DHC/Plants/Cooling/BaseClasses/Validation/IdealUser.mos
index 48650223020..56e1bd9a130 100644
--- a/Buildings/Resources/Scripts/Dymola/Experimental/DHC/Plants/Cooling/BaseClasses/Validation/IdealUser.mos
+++ b/Buildings/Resources/Scripts/Dymola/DHC/Plants/Cooling/BaseClasses/Validation/IdealUser.mos
@@ -1,4 +1,4 @@
-simulateModel("Buildings.Experimental.DHC.Plants.Cooling.BaseClasses.Validation.IdealUser",
+simulateModel("Buildings.DHC.Plants.Cooling.BaseClasses.Validation.IdealUser",
  stopTime=3600,
  tolerance=1e-06,
  method="dassl",
diff --git a/Buildings/Resources/Scripts/Dymola/Experimental/DHC/Plants/Cooling/Controls/Validation/ChilledWaterBypass.mos b/Buildings/Resources/Scripts/Dymola/DHC/Plants/Cooling/Controls/Validation/ChilledWaterBypass.mos
similarity index 89%
rename from Buildings/Resources/Scripts/Dymola/Experimental/DHC/Plants/Cooling/Controls/Validation/ChilledWaterBypass.mos
rename to Buildings/Resources/Scripts/Dymola/DHC/Plants/Cooling/Controls/Validation/ChilledWaterBypass.mos
index 4e39d74a8db..181b22c40a2 100644
--- a/Buildings/Resources/Scripts/Dymola/Experimental/DHC/Plants/Cooling/Controls/Validation/ChilledWaterBypass.mos
+++ b/Buildings/Resources/Scripts/Dymola/DHC/Plants/Cooling/Controls/Validation/ChilledWaterBypass.mos
@@ -1,5 +1,5 @@
 // Simulate
-simulateModel("Buildings.Experimental.DHC.Plants.Cooling.Controls.Validation.ChilledWaterBypass", 
+simulateModel("Buildings.DHC.Plants.Cooling.Controls.Validation.ChilledWaterBypass", 
     stopTime=1200, 
     method="Cvode", 
     tolerance=1e-06,
diff --git a/Buildings/Resources/Scripts/Dymola/Experimental/DHC/Plants/Cooling/Controls/Validation/ChilledWaterPumpSpeed.mos b/Buildings/Resources/Scripts/Dymola/DHC/Plants/Cooling/Controls/Validation/ChilledWaterPumpSpeed.mos
similarity index 88%
rename from Buildings/Resources/Scripts/Dymola/Experimental/DHC/Plants/Cooling/Controls/Validation/ChilledWaterPumpSpeed.mos
rename to Buildings/Resources/Scripts/Dymola/DHC/Plants/Cooling/Controls/Validation/ChilledWaterPumpSpeed.mos
index 4934e3f066b..c713ce2b136 100644
--- a/Buildings/Resources/Scripts/Dymola/Experimental/DHC/Plants/Cooling/Controls/Validation/ChilledWaterPumpSpeed.mos
+++ b/Buildings/Resources/Scripts/Dymola/DHC/Plants/Cooling/Controls/Validation/ChilledWaterPumpSpeed.mos
@@ -1,5 +1,5 @@
 // Simulate
-simulateModel("Buildings.Experimental.DHC.Plants.Cooling.Controls.Validation.ChilledWaterPumpSpeed",
+simulateModel("Buildings.DHC.Plants.Cooling.Controls.Validation.ChilledWaterPumpSpeed",
 	stopTime=1200,
 	method="Cvode",
 	tolerance=1e-06,
diff --git a/Buildings/Resources/Scripts/Dymola/Experimental/DHC/Plants/Cooling/Controls/Validation/ChillerStage.mos b/Buildings/Resources/Scripts/Dymola/DHC/Plants/Cooling/Controls/Validation/ChillerStage.mos
similarity index 88%
rename from Buildings/Resources/Scripts/Dymola/Experimental/DHC/Plants/Cooling/Controls/Validation/ChillerStage.mos
rename to Buildings/Resources/Scripts/Dymola/DHC/Plants/Cooling/Controls/Validation/ChillerStage.mos
index 03219290697..5d1949f488a 100644
--- a/Buildings/Resources/Scripts/Dymola/Experimental/DHC/Plants/Cooling/Controls/Validation/ChillerStage.mos
+++ b/Buildings/Resources/Scripts/Dymola/DHC/Plants/Cooling/Controls/Validation/ChillerStage.mos
@@ -1,5 +1,5 @@
 // Simulate
-simulateModel("Buildings.Experimental.DHC.Plants.Cooling.Controls.Validation.ChillerStage",
+simulateModel("Buildings.DHC.Plants.Cooling.Controls.Validation.ChillerStage",
     stopTime=1200,
     method="Cvode",
     tolerance=1e-06,
diff --git a/Buildings/Resources/Scripts/Dymola/Experimental/DHC/Plants/Cooling/Controls/Validation/TankStatus.mos b/Buildings/Resources/Scripts/Dymola/DHC/Plants/Cooling/Controls/Validation/TankStatus.mos
similarity index 87%
rename from Buildings/Resources/Scripts/Dymola/Experimental/DHC/Plants/Cooling/Controls/Validation/TankStatus.mos
rename to Buildings/Resources/Scripts/Dymola/DHC/Plants/Cooling/Controls/Validation/TankStatus.mos
index 7341fe817fe..e3cb4d0eb56 100644
--- a/Buildings/Resources/Scripts/Dymola/Experimental/DHC/Plants/Cooling/Controls/Validation/TankStatus.mos
+++ b/Buildings/Resources/Scripts/Dymola/DHC/Plants/Cooling/Controls/Validation/TankStatus.mos
@@ -1,4 +1,4 @@
-simulateModel("Buildings.Experimental.DHC.Plants.Cooling.Controls.Validation.TankStatus",
+simulateModel("Buildings.DHC.Plants.Cooling.Controls.Validation.TankStatus",
     stopTime=1, method="Dassl", tolerance=1e-06, resultFile="TankStatus");
 // Plot commands
 removePlots(false);
diff --git a/Buildings/Resources/Scripts/Dymola/Experimental/DHC/Plants/Cooling/Examples/ElectricChillerParallel.mos b/Buildings/Resources/Scripts/Dymola/DHC/Plants/Cooling/Examples/ElectricChillerParallel.mos
similarity index 95%
rename from Buildings/Resources/Scripts/Dymola/Experimental/DHC/Plants/Cooling/Examples/ElectricChillerParallel.mos
rename to Buildings/Resources/Scripts/Dymola/DHC/Plants/Cooling/Examples/ElectricChillerParallel.mos
index d9867f3e5dc..e949d5e6c72 100644
--- a/Buildings/Resources/Scripts/Dymola/Experimental/DHC/Plants/Cooling/Examples/ElectricChillerParallel.mos
+++ b/Buildings/Resources/Scripts/Dymola/DHC/Plants/Cooling/Examples/ElectricChillerParallel.mos
@@ -1,5 +1,5 @@
 // Simulate
-simulateModel("Buildings.Experimental.DHC.Plants.Cooling.Examples.ElectricChillerParallel", 
+simulateModel("Buildings.DHC.Plants.Cooling.Examples.ElectricChillerParallel", 
     stopTime=86400, 
     method="cvode",
     tolerance=1e-06, 
diff --git a/Buildings/Resources/Scripts/Dymola/Experimental/DHC/Plants/Cooling/Examples/StoragePlantDualSource.mos b/Buildings/Resources/Scripts/Dymola/DHC/Plants/Cooling/Examples/StoragePlantDualSource.mos
similarity index 94%
rename from Buildings/Resources/Scripts/Dymola/Experimental/DHC/Plants/Cooling/Examples/StoragePlantDualSource.mos
rename to Buildings/Resources/Scripts/Dymola/DHC/Plants/Cooling/Examples/StoragePlantDualSource.mos
index 8642a3ada31..d797d44d199 100644
--- a/Buildings/Resources/Scripts/Dymola/Experimental/DHC/Plants/Cooling/Examples/StoragePlantDualSource.mos
+++ b/Buildings/Resources/Scripts/Dymola/DHC/Plants/Cooling/Examples/StoragePlantDualSource.mos
@@ -1,4 +1,4 @@
-simulateModel("Buildings.Experimental.DHC.Plants.Cooling.Examples.StoragePlantDualSource",
+simulateModel("Buildings.DHC.Plants.Cooling.Examples.StoragePlantDualSource",
  stopTime=9000,
  tolerance=1e-06,
  method="radau",
diff --git a/Buildings/Resources/Scripts/Dymola/Experimental/DHC/Plants/Cooling/Subsystems/Examples/CoolingTowersParallel.mos b/Buildings/Resources/Scripts/Dymola/DHC/Plants/Cooling/Subsystems/Examples/CoolingTowersParallel.mos
similarity index 89%
rename from Buildings/Resources/Scripts/Dymola/Experimental/DHC/Plants/Cooling/Subsystems/Examples/CoolingTowersParallel.mos
rename to Buildings/Resources/Scripts/Dymola/DHC/Plants/Cooling/Subsystems/Examples/CoolingTowersParallel.mos
index 8017cda4463..6bf0c6f1346 100644
--- a/Buildings/Resources/Scripts/Dymola/Experimental/DHC/Plants/Cooling/Subsystems/Examples/CoolingTowersParallel.mos
+++ b/Buildings/Resources/Scripts/Dymola/DHC/Plants/Cooling/Subsystems/Examples/CoolingTowersParallel.mos
@@ -1,5 +1,5 @@
 // Simulate
-simulateModel("Buildings.Experimental.DHC.Plants.Cooling.Subsystems.Examples.CoolingTowersParallel", 
+simulateModel("Buildings.DHC.Plants.Cooling.Subsystems.Examples.CoolingTowersParallel", 
 	startTime=15552000, 
 	stopTime=15724800, 
 	method="cvode", 
diff --git a/Buildings/Resources/Scripts/Dymola/Experimental/DHC/Plants/Cooling/Subsystems/Examples/CoolingTowersWithBypass.mos b/Buildings/Resources/Scripts/Dymola/DHC/Plants/Cooling/Subsystems/Examples/CoolingTowersWithBypass.mos
similarity index 93%
rename from Buildings/Resources/Scripts/Dymola/Experimental/DHC/Plants/Cooling/Subsystems/Examples/CoolingTowersWithBypass.mos
rename to Buildings/Resources/Scripts/Dymola/DHC/Plants/Cooling/Subsystems/Examples/CoolingTowersWithBypass.mos
index 04b74a08720..d3de7d9d2e7 100644
--- a/Buildings/Resources/Scripts/Dymola/Experimental/DHC/Plants/Cooling/Subsystems/Examples/CoolingTowersWithBypass.mos
+++ b/Buildings/Resources/Scripts/Dymola/DHC/Plants/Cooling/Subsystems/Examples/CoolingTowersWithBypass.mos
@@ -1,5 +1,5 @@
 // Simulate
-simulateModel("Buildings.Experimental.DHC.Plants.Cooling.Subsystems.Examples.CoolingTowersWithBypass", 
+simulateModel("Buildings.DHC.Plants.Cooling.Subsystems.Examples.CoolingTowersWithBypass", 
 	startTime=10368000, 
 	stopTime=10540800, 
 	method="cvode", 
diff --git a/Buildings/Resources/Scripts/Dymola/Experimental/DHC/Plants/Steam/BaseClasses/Examples/BoilerPolynomial.mos b/Buildings/Resources/Scripts/Dymola/DHC/Plants/Steam/BaseClasses/Examples/BoilerPolynomial.mos
similarity index 78%
rename from Buildings/Resources/Scripts/Dymola/Experimental/DHC/Plants/Steam/BaseClasses/Examples/BoilerPolynomial.mos
rename to Buildings/Resources/Scripts/Dymola/DHC/Plants/Steam/BaseClasses/Examples/BoilerPolynomial.mos
index 4d03fcd876d..dcd928dcf86 100644
--- a/Buildings/Resources/Scripts/Dymola/Experimental/DHC/Plants/Steam/BaseClasses/Examples/BoilerPolynomial.mos
+++ b/Buildings/Resources/Scripts/Dymola/DHC/Plants/Steam/BaseClasses/Examples/BoilerPolynomial.mos
@@ -1,5 +1,5 @@
 // Simulate
-simulateModel("Buildings.Experimental.DHC.Plants.Steam.BaseClasses.Examples.BoilerPolynomial", stopTime=3600, tolerance=1e-06, method="dassl", resultFile="BoilerPolynomial");
+simulateModel("Buildings.DHC.Plants.Steam.BaseClasses.Examples.BoilerPolynomial", stopTime=3600, tolerance=1e-06, method="dassl", resultFile="BoilerPolynomial");
 // Plot commands
 createPlot(id=1, position={33, 21, 614, 476}, 
 	y={"y.y"}, 
diff --git a/Buildings/Resources/Scripts/Dymola/Experimental/DHC/Plants/Steam/BaseClasses/Examples/ControlVolumeEvaporation.mos b/Buildings/Resources/Scripts/Dymola/DHC/Plants/Steam/BaseClasses/Examples/ControlVolumeEvaporation.mos
similarity index 78%
rename from Buildings/Resources/Scripts/Dymola/Experimental/DHC/Plants/Steam/BaseClasses/Examples/ControlVolumeEvaporation.mos
rename to Buildings/Resources/Scripts/Dymola/DHC/Plants/Steam/BaseClasses/Examples/ControlVolumeEvaporation.mos
index 7eda5f07b15..e637fe125ce 100644
--- a/Buildings/Resources/Scripts/Dymola/Experimental/DHC/Plants/Steam/BaseClasses/Examples/ControlVolumeEvaporation.mos
+++ b/Buildings/Resources/Scripts/Dymola/DHC/Plants/Steam/BaseClasses/Examples/ControlVolumeEvaporation.mos
@@ -1,5 +1,5 @@
 // Simulate
-simulateModel("Buildings.Experimental.DHC.Plants.Steam.BaseClasses.Examples.ControlVolumeEvaporation", tolerance=1e-06, stopTime=1.0, method="dassl", resultFile="ControlVolumeEvaporation");
+simulateModel("Buildings.DHC.Plants.Steam.BaseClasses.Examples.ControlVolumeEvaporation", tolerance=1e-06, stopTime=1.0, method="dassl", resultFile="ControlVolumeEvaporation");
 // Plot
 createPlot(id=1, position={27, 10, 521, 446}, 
 	y={"volDyn.port_a.m_flow", "volSte.port_a.m_flow"}, 
diff --git a/Buildings/Resources/Scripts/Dymola/Experimental/DHC/Plants/Steam/Examples/SingleBoiler.mos b/Buildings/Resources/Scripts/Dymola/DHC/Plants/Steam/Examples/SingleBoiler.mos
similarity index 82%
rename from Buildings/Resources/Scripts/Dymola/Experimental/DHC/Plants/Steam/Examples/SingleBoiler.mos
rename to Buildings/Resources/Scripts/Dymola/DHC/Plants/Steam/Examples/SingleBoiler.mos
index 33a37bc6124..c904bc6944d 100644
--- a/Buildings/Resources/Scripts/Dymola/Experimental/DHC/Plants/Steam/Examples/SingleBoiler.mos
+++ b/Buildings/Resources/Scripts/Dymola/DHC/Plants/Steam/Examples/SingleBoiler.mos
@@ -1,5 +1,5 @@
 // Simulate
-simulateModel("Buildings.Experimental.DHC.Plants.Steam.Examples.SingleBoiler", stopTime=86400, tolerance=1e-6, method="dassl", resultFile="SingleBoiler");
+simulateModel("Buildings.DHC.Plants.Steam.Examples.SingleBoiler", stopTime=86400, tolerance=1e-6, method="dassl", resultFile="SingleBoiler");
 // Plot commands
 createPlot(id=1, position={55, 34, 558, 505}, 
   y={"vol.m_flow"}, 
diff --git a/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Experimental.DHC.EnergyTransferStations.BaseClasses.Validation.CollectorDistributor.mos b/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.DHC.ETS.BaseClasses.Validation.CollectorDistributor.mos
similarity index 100%
rename from Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Experimental.DHC.EnergyTransferStations.BaseClasses.Validation.CollectorDistributor.mos
rename to Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.DHC.ETS.BaseClasses.Validation.CollectorDistributor.mos
diff --git a/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Experimental.DHC.EnergyTransferStations.Combined.Examples.ChillerBorefield.mos b/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.DHC.ETS.Combined.Examples.ChillerBorefield.mos
similarity index 100%
rename from Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Experimental.DHC.EnergyTransferStations.Combined.Examples.ChillerBorefield.mos
rename to Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.DHC.ETS.Combined.Examples.ChillerBorefield.mos
diff --git a/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Experimental.DHC.EnergyTransferStations.Combined.Examples.ChillerOnly.mos b/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.DHC.ETS.Combined.Examples.ChillerOnly.mos
similarity index 100%
rename from Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Experimental.DHC.EnergyTransferStations.Combined.Examples.ChillerOnly.mos
rename to Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.DHC.ETS.Combined.Examples.ChillerOnly.mos
diff --git a/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Experimental.DHC.EnergyTransferStations.Combined.Subsystems.Validation.Borefield.mos b/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.DHC.ETS.Combined.Subsystems.Validation.Borefield.mos
similarity index 100%
rename from Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Experimental.DHC.EnergyTransferStations.Combined.Subsystems.Validation.Borefield.mos
rename to Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.DHC.ETS.Combined.Subsystems.Validation.Borefield.mos
diff --git a/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Experimental.DHC.EnergyTransferStations.Combined.Subsystems.Validation.Chiller.mos b/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.DHC.ETS.Combined.Subsystems.Validation.Chiller.mos
similarity index 100%
rename from Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Experimental.DHC.EnergyTransferStations.Combined.Subsystems.Validation.Chiller.mos
rename to Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.DHC.ETS.Combined.Subsystems.Validation.Chiller.mos
diff --git a/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Experimental.DHC.EnergyTransferStations.Combined.Subsystems.Validation.HeatExchanger.mos b/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.DHC.ETS.Combined.Subsystems.Validation.HeatExchanger.mos
similarity index 100%
rename from Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Experimental.DHC.EnergyTransferStations.Combined.Subsystems.Validation.HeatExchanger.mos
rename to Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.DHC.ETS.Combined.Subsystems.Validation.HeatExchanger.mos
diff --git a/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Experimental.DHC.EnergyTransferStations.Combined.Subsystems.Validation.HeatPump.mos b/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.DHC.ETS.Combined.Subsystems.Validation.HeatPump.mos
similarity index 100%
rename from Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Experimental.DHC.EnergyTransferStations.Combined.Subsystems.Validation.HeatPump.mos
rename to Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.DHC.ETS.Combined.Subsystems.Validation.HeatPump.mos
diff --git a/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Experimental.DHC.EnergyTransferStations.Combined.Subsystems.Validation.HeatPumpDHWTank.mos b/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.DHC.ETS.Combined.Subsystems.Validation.HeatPumpDHWTank.mos
similarity index 100%
rename from Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Experimental.DHC.EnergyTransferStations.Combined.Subsystems.Validation.HeatPumpDHWTank.mos
rename to Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.DHC.ETS.Combined.Subsystems.Validation.HeatPumpDHWTank.mos
diff --git a/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Experimental.DHC.EnergyTransferStations.Combined.Subsystems.Validation.SwitchBox.mos b/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.DHC.ETS.Combined.Subsystems.Validation.SwitchBox.mos
similarity index 100%
rename from Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Experimental.DHC.EnergyTransferStations.Combined.Subsystems.Validation.SwitchBox.mos
rename to Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.DHC.ETS.Combined.Subsystems.Validation.SwitchBox.mos
diff --git a/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Experimental.DHC.EnergyTransferStations.Combined.Subsystems.Validation.WatersideEconomizer.mos b/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.DHC.ETS.Combined.Subsystems.Validation.WatersideEconomizer.mos
similarity index 100%
rename from Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Experimental.DHC.EnergyTransferStations.Combined.Subsystems.Validation.WatersideEconomizer.mos
rename to Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.DHC.ETS.Combined.Subsystems.Validation.WatersideEconomizer.mos
diff --git a/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Experimental.DHC.EnergyTransferStations.Combined.Validation.ChillerBorefield.mos b/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.DHC.ETS.Combined.Validation.ChillerBorefield.mos
similarity index 100%
rename from Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Experimental.DHC.EnergyTransferStations.Combined.Validation.ChillerBorefield.mos
rename to Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.DHC.ETS.Combined.Validation.ChillerBorefield.mos
diff --git a/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Experimental.DHC.EnergyTransferStations.Combined.Validation.ChillerOnly.mos b/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.DHC.ETS.Combined.Validation.ChillerOnly.mos
similarity index 100%
rename from Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Experimental.DHC.EnergyTransferStations.Combined.Validation.ChillerOnly.mos
rename to Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.DHC.ETS.Combined.Validation.ChillerOnly.mos
diff --git a/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Experimental.DHC.EnergyTransferStations.Combined.Validation.ChillerWSE.mos b/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.DHC.ETS.Combined.Validation.ChillerWSE.mos
similarity index 100%
rename from Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Experimental.DHC.EnergyTransferStations.Combined.Validation.ChillerWSE.mos
rename to Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.DHC.ETS.Combined.Validation.ChillerWSE.mos
diff --git a/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Experimental.DHC.EnergyTransferStations.Cooling.Examples.Direct.mos b/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.DHC.ETS.Cooling.Examples.Direct.mos
similarity index 100%
rename from Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Experimental.DHC.EnergyTransferStations.Cooling.Examples.Direct.mos
rename to Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.DHC.ETS.Cooling.Examples.Direct.mos
diff --git a/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Experimental.DHC.EnergyTransferStations.Cooling.Examples.Indirect.mos b/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.DHC.ETS.Cooling.Examples.Indirect.mos
similarity index 100%
rename from Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Experimental.DHC.EnergyTransferStations.Cooling.Examples.Indirect.mos
rename to Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.DHC.ETS.Cooling.Examples.Indirect.mos
diff --git a/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Experimental.DHC.EnergyTransferStations.Heating.Examples.Direct.mos b/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.DHC.ETS.Heating.Examples.Direct.mos
similarity index 100%
rename from Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Experimental.DHC.EnergyTransferStations.Heating.Examples.Direct.mos
rename to Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.DHC.ETS.Heating.Examples.Direct.mos
diff --git a/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Experimental.DHC.EnergyTransferStations.Heating.Examples.Indirect.mos b/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.DHC.ETS.Heating.Examples.Indirect.mos
similarity index 100%
rename from Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Experimental.DHC.EnergyTransferStations.Heating.Examples.Indirect.mos
rename to Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.DHC.ETS.Heating.Examples.Indirect.mos
diff --git a/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Experimental.DHC.Examples.Combined.SeriesConstantFlow.mos b/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.DHC.Examples.Combined.SeriesConstantFlow.mos
similarity index 100%
rename from Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Experimental.DHC.Examples.Combined.SeriesConstantFlow.mos
rename to Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.DHC.Examples.Combined.SeriesConstantFlow.mos
diff --git a/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Experimental.DHC.Examples.Combined.SeriesVariableFlow.mos b/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.DHC.Examples.Combined.SeriesVariableFlow.mos
similarity index 100%
rename from Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Experimental.DHC.Examples.Combined.SeriesVariableFlow.mos
rename to Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.DHC.Examples.Combined.SeriesVariableFlow.mos
diff --git a/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Experimental.DHC.Examples.Combined.SeriesVariableFlowAgentControl.mos b/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.DHC.Examples.Combined.SeriesVariableFlowAgentControl.mos
similarity index 100%
rename from Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Experimental.DHC.Examples.Combined.SeriesVariableFlowAgentControl.mos
rename to Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.DHC.Examples.Combined.SeriesVariableFlowAgentControl.mos
diff --git a/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Experimental.DHC.Examples.Cooling.ElectricChillersDirectETS.mos b/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.DHC.Examples.Cooling.ElectricChillersDirectETS.mos
similarity index 100%
rename from Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Experimental.DHC.Examples.Cooling.ElectricChillersDirectETS.mos
rename to Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.DHC.Examples.Cooling.ElectricChillersDirectETS.mos
diff --git a/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Experimental.DHC.Examples.Steam.SingleBoiler.mos b/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.DHC.Examples.Steam.SingleBoiler.mos
similarity index 100%
rename from Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Experimental.DHC.Examples.Steam.SingleBoiler.mos
rename to Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.DHC.Examples.Steam.SingleBoiler.mos
diff --git a/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Experimental.DHC.Loads.BaseClasses.Controls.Validation.MixingValveControl.mos b/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.DHC.Loads.BaseClasses.Controls.Validation.MixingValveControl.mos
similarity index 100%
rename from Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Experimental.DHC.Loads.BaseClasses.Controls.Validation.MixingValveControl.mos
rename to Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.DHC.Loads.BaseClasses.Controls.Validation.MixingValveControl.mos
diff --git a/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Experimental.DHC.Loads.BaseClasses.Examples.CouplingRCZ1Valve.mos b/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.DHC.Loads.BaseClasses.Examples.CouplingRCZ1Valve.mos
similarity index 100%
rename from Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Experimental.DHC.Loads.BaseClasses.Examples.CouplingRCZ1Valve.mos
rename to Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.DHC.Loads.BaseClasses.Examples.CouplingRCZ1Valve.mos
diff --git a/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Experimental.DHC.Loads.BaseClasses.Examples.CouplingRCZ6.mos b/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.DHC.Loads.BaseClasses.Examples.CouplingRCZ6.mos
similarity index 100%
rename from Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Experimental.DHC.Loads.BaseClasses.Examples.CouplingRCZ6.mos
rename to Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.DHC.Loads.BaseClasses.Examples.CouplingRCZ6.mos
diff --git a/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Experimental.DHC.Loads.BaseClasses.Examples.CouplingSpawnZ1.mos b/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.DHC.Loads.BaseClasses.Examples.CouplingSpawnZ1.mos
similarity index 100%
rename from Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Experimental.DHC.Loads.BaseClasses.Examples.CouplingSpawnZ1.mos
rename to Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.DHC.Loads.BaseClasses.Examples.CouplingSpawnZ1.mos
diff --git a/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Experimental.DHC.Loads.BaseClasses.Examples.CouplingSpawnZ6.mos b/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.DHC.Loads.BaseClasses.Examples.CouplingSpawnZ6.mos
similarity index 100%
rename from Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Experimental.DHC.Loads.BaseClasses.Examples.CouplingSpawnZ6.mos
rename to Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.DHC.Loads.BaseClasses.Examples.CouplingSpawnZ6.mos
diff --git a/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Experimental.DHC.Loads.BaseClasses.Examples.CouplingTimeSeries.mos b/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.DHC.Loads.BaseClasses.Examples.CouplingTimeSeries.mos
similarity index 100%
rename from Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Experimental.DHC.Loads.BaseClasses.Examples.CouplingTimeSeries.mos
rename to Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.DHC.Loads.BaseClasses.Examples.CouplingTimeSeries.mos
diff --git a/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Experimental.DHC.Loads.BaseClasses.Examples.CouplingTimeSeriesSingleLoop.mos b/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.DHC.Loads.BaseClasses.Examples.CouplingTimeSeriesSingleLoop.mos
similarity index 100%
rename from Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Experimental.DHC.Loads.BaseClasses.Examples.CouplingTimeSeriesSingleLoop.mos
rename to Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.DHC.Loads.BaseClasses.Examples.CouplingTimeSeriesSingleLoop.mos
diff --git a/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Experimental.DHC.Loads.BaseClasses.Validation.BenchmarkFlowDistribution1.mos b/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.DHC.Loads.BaseClasses.Validation.BenchmarkFlowDistribution1.mos
similarity index 100%
rename from Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Experimental.DHC.Loads.BaseClasses.Validation.BenchmarkFlowDistribution1.mos
rename to Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.DHC.Loads.BaseClasses.Validation.BenchmarkFlowDistribution1.mos
diff --git a/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Experimental.DHC.Loads.BaseClasses.Validation.BenchmarkFlowDistribution2.mos b/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.DHC.Loads.BaseClasses.Validation.BenchmarkFlowDistribution2.mos
similarity index 100%
rename from Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Experimental.DHC.Loads.BaseClasses.Validation.BenchmarkFlowDistribution2.mos
rename to Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.DHC.Loads.BaseClasses.Validation.BenchmarkFlowDistribution2.mos
diff --git a/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Experimental.DHC.Loads.BaseClasses.Validation.BuildingWithETS.mos b/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.DHC.Loads.BaseClasses.Validation.BuildingWithETS.mos
similarity index 100%
rename from Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Experimental.DHC.Loads.BaseClasses.Validation.BuildingWithETS.mos
rename to Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.DHC.Loads.BaseClasses.Validation.BuildingWithETS.mos
diff --git a/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Experimental.DHC.Loads.BaseClasses.Validation.FlowDistributionPumpControl.mos b/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.DHC.Loads.BaseClasses.Validation.FlowDistributionPumpControl.mos
similarity index 100%
rename from Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Experimental.DHC.Loads.BaseClasses.Validation.FlowDistributionPumpControl.mos
rename to Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.DHC.Loads.BaseClasses.Validation.FlowDistributionPumpControl.mos
diff --git a/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Experimental.DHC.Loads.BaseClasses.Validation.GetPeakLoad.mos b/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.DHC.Loads.BaseClasses.Validation.GetPeakLoad.mos
similarity index 100%
rename from Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Experimental.DHC.Loads.BaseClasses.Validation.GetPeakLoad.mos
rename to Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.DHC.Loads.BaseClasses.Validation.GetPeakLoad.mos
diff --git a/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Experimental.DHC.Loads.BaseClasses.Validation.SimpleRoomODE.mos b/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.DHC.Loads.BaseClasses.Validation.SimpleRoomODE.mos
similarity index 100%
rename from Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Experimental.DHC.Loads.BaseClasses.Validation.SimpleRoomODE.mos
rename to Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.DHC.Loads.BaseClasses.Validation.SimpleRoomODE.mos
diff --git a/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Experimental.DHC.Loads.BaseClasses.Validation.TerminalUnitScaling.mos b/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.DHC.Loads.BaseClasses.Validation.TerminalUnitScaling.mos
similarity index 100%
rename from Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Experimental.DHC.Loads.BaseClasses.Validation.TerminalUnitScaling.mos
rename to Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.DHC.Loads.BaseClasses.Validation.TerminalUnitScaling.mos
diff --git a/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Experimental.DHC.Loads.Combined.Examples.BuildingTimeSeriesWithETS.mos b/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.DHC.Loads.Combined.Examples.BuildingTimeSeriesWithETS.mos
similarity index 100%
rename from Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Experimental.DHC.Loads.Combined.Examples.BuildingTimeSeriesWithETS.mos
rename to Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.DHC.Loads.Combined.Examples.BuildingTimeSeriesWithETS.mos
diff --git a/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Experimental.DHC.Loads.Combined.Examples.BuildingTimeSeriesWithETSDHWTank.mos b/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.DHC.Loads.Combined.Examples.BuildingTimeSeriesWithETSDHWTank.mos
similarity index 100%
rename from Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Experimental.DHC.Loads.Combined.Examples.BuildingTimeSeriesWithETSDHWTank.mos
rename to Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.DHC.Loads.Combined.Examples.BuildingTimeSeriesWithETSDHWTank.mos
diff --git a/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Experimental.DHC.Loads.Cooling.Examples.BuildingTimeSeriesWithETS.mos b/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.DHC.Loads.Cooling.Examples.BuildingTimeSeriesWithETS.mos
similarity index 100%
rename from Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Experimental.DHC.Loads.Cooling.Examples.BuildingTimeSeriesWithETS.mos
rename to Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.DHC.Loads.Cooling.Examples.BuildingTimeSeriesWithETS.mos
diff --git a/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Experimental.DHC.Loads.Heating.Examples.BuildingTimeSeriesWithETS.mos b/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.DHC.Loads.Heating.Examples.BuildingTimeSeriesWithETS.mos
similarity index 100%
rename from Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Experimental.DHC.Loads.Heating.Examples.BuildingTimeSeriesWithETS.mos
rename to Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.DHC.Loads.Heating.Examples.BuildingTimeSeriesWithETS.mos
diff --git a/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Experimental.DHC.Loads.HotWater.Examples.HeaterAndFixtureDirectHeatExchangerWithElectricHeat.mos b/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.DHC.Loads.HotWater.Examples.HeaterAndFixtureDirectHeatExchangerWithElectricHeat.mos
similarity index 100%
rename from Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Experimental.DHC.Loads.HotWater.Examples.HeaterAndFixtureDirectHeatExchangerWithElectricHeat.mos
rename to Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.DHC.Loads.HotWater.Examples.HeaterAndFixtureDirectHeatExchangerWithElectricHeat.mos
diff --git a/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Experimental.DHC.Loads.HotWater.Examples.StorageTankWithExternalHeatExchanger.mos b/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.DHC.Loads.HotWater.Examples.StorageTankWithExternalHeatExchanger.mos
similarity index 100%
rename from Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Experimental.DHC.Loads.HotWater.Examples.StorageTankWithExternalHeatExchanger.mos
rename to Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.DHC.Loads.HotWater.Examples.StorageTankWithExternalHeatExchanger.mos
diff --git a/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Experimental.DHC.Loads.Steam.BaseClasses.Examples.ControlVolumeCondensation.mos b/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.DHC.Loads.Steam.BaseClasses.Examples.ControlVolumeCondensation.mos
similarity index 100%
rename from Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Experimental.DHC.Loads.Steam.BaseClasses.Examples.ControlVolumeCondensation.mos
rename to Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.DHC.Loads.Steam.BaseClasses.Examples.ControlVolumeCondensation.mos
diff --git a/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Experimental.DHC.Loads.Steam.BaseClasses.Examples.SteamTrap.mos b/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.DHC.Loads.Steam.BaseClasses.Examples.SteamTrap.mos
similarity index 100%
rename from Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Experimental.DHC.Loads.Steam.BaseClasses.Examples.SteamTrap.mos
rename to Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.DHC.Loads.Steam.BaseClasses.Examples.SteamTrap.mos
diff --git a/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Experimental.DHC.Loads.Steam.BaseClasses.Examples.ValveSelfActing.mos b/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.DHC.Loads.Steam.BaseClasses.Examples.ValveSelfActing.mos
similarity index 100%
rename from Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Experimental.DHC.Loads.Steam.BaseClasses.Examples.ValveSelfActing.mos
rename to Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.DHC.Loads.Steam.BaseClasses.Examples.ValveSelfActing.mos
diff --git a/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Experimental.DHC.Loads.Steam.Examples.BuildingTimeSeriesAtETS.mos b/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.DHC.Loads.Steam.Examples.BuildingTimeSeriesAtETS.mos
similarity index 100%
rename from Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Experimental.DHC.Loads.Steam.Examples.BuildingTimeSeriesAtETS.mos
rename to Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.DHC.Loads.Steam.Examples.BuildingTimeSeriesAtETS.mos
diff --git a/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Experimental.DHC.Networks.Connections.Examples.Connection1PipeExample.mos b/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.DHC.Networks.Connections.Examples.Connection1PipeExample.mos
similarity index 100%
rename from Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Experimental.DHC.Networks.Connections.Examples.Connection1PipeExample.mos
rename to Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.DHC.Networks.Connections.Examples.Connection1PipeExample.mos
diff --git a/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Experimental.DHC.Networks.Connections.Examples.Connection2PipeExample.mos b/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.DHC.Networks.Connections.Examples.Connection2PipeExample.mos
similarity index 100%
rename from Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Experimental.DHC.Networks.Connections.Examples.Connection2PipeExample.mos
rename to Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.DHC.Networks.Connections.Examples.Connection2PipeExample.mos
diff --git a/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Experimental.DHC.Networks.Controls.Examples.AgentPump1PipeExample.mos b/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.DHC.Networks.Controls.Examples.AgentPump1PipeExample.mos
similarity index 100%
rename from Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Experimental.DHC.Networks.Controls.Examples.AgentPump1PipeExample.mos
rename to Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.DHC.Networks.Controls.Examples.AgentPump1PipeExample.mos
diff --git a/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Experimental.DHC.Networks.Controls.Examples.MainPump1PipeExample.mos b/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.DHC.Networks.Controls.Examples.MainPump1PipeExample.mos
similarity index 100%
rename from Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Experimental.DHC.Networks.Controls.Examples.MainPump1PipeExample.mos
rename to Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.DHC.Networks.Controls.Examples.MainPump1PipeExample.mos
diff --git a/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Experimental.DHC.Networks.Examples.Distribution1PipeExample.mos b/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.DHC.Networks.Examples.Distribution1PipeExample.mos
similarity index 100%
rename from Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Experimental.DHC.Networks.Examples.Distribution1PipeExample.mos
rename to Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.DHC.Networks.Examples.Distribution1PipeExample.mos
diff --git a/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Experimental.DHC.Networks.Examples.Distribution2PipeExample.mos b/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.DHC.Networks.Examples.Distribution2PipeExample.mos
similarity index 100%
rename from Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Experimental.DHC.Networks.Examples.Distribution2PipeExample.mos
rename to Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.DHC.Networks.Examples.Distribution2PipeExample.mos
diff --git a/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Experimental.DHC.Networks.Pipes.Validation.Pipe.mos b/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.DHC.Networks.Pipes.Validation.Pipe.mos
similarity index 100%
rename from Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Experimental.DHC.Networks.Pipes.Validation.Pipe.mos
rename to Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.DHC.Networks.Pipes.Validation.Pipe.mos
diff --git a/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Experimental.DHC.Networks.Steam.Examples.ConnectionCondensatePipe.mos b/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.DHC.Networks.Steam.Examples.ConnectionCondensatePipe.mos
similarity index 100%
rename from Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Experimental.DHC.Networks.Steam.Examples.ConnectionCondensatePipe.mos
rename to Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.DHC.Networks.Steam.Examples.ConnectionCondensatePipe.mos
diff --git a/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Experimental.DHC.Networks.Steam.Examples.DistributionCondensatePipe.mos b/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.DHC.Networks.Steam.Examples.DistributionCondensatePipe.mos
similarity index 100%
rename from Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Experimental.DHC.Networks.Steam.Examples.DistributionCondensatePipe.mos
rename to Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.DHC.Networks.Steam.Examples.DistributionCondensatePipe.mos
diff --git a/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Experimental.DHC.Plants.Combined.Controls.BaseClasses.Validation.StageIndex.mos b/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.DHC.Plants.Combined.Controls.BaseClasses.Validation.StageIndex.mos
similarity index 100%
rename from Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Experimental.DHC.Plants.Combined.Controls.BaseClasses.Validation.StageIndex.mos
rename to Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.DHC.Plants.Combined.Controls.BaseClasses.Validation.StageIndex.mos
diff --git a/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Experimental.DHC.Plants.Combined.Controls.BaseClasses.Validation.StagingPlant.mos b/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.DHC.Plants.Combined.Controls.BaseClasses.Validation.StagingPlant.mos
similarity index 100%
rename from Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Experimental.DHC.Plants.Combined.Controls.BaseClasses.Validation.StagingPlant.mos
rename to Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.DHC.Plants.Combined.Controls.BaseClasses.Validation.StagingPlant.mos
diff --git a/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Experimental.DHC.Plants.Combined.Controls.BaseClasses.Validation.StagingPump.mos b/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.DHC.Plants.Combined.Controls.BaseClasses.Validation.StagingPump.mos
similarity index 100%
rename from Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Experimental.DHC.Plants.Combined.Controls.BaseClasses.Validation.StagingPump.mos
rename to Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.DHC.Plants.Combined.Controls.BaseClasses.Validation.StagingPump.mos
diff --git a/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Experimental.DHC.Plants.Combined.Examples.AllElectricCWStorage.mos b/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.DHC.Plants.Combined.Examples.AllElectricCWStorage.mos
similarity index 100%
rename from Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Experimental.DHC.Plants.Combined.Examples.AllElectricCWStorage.mos
rename to Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.DHC.Plants.Combined.Examples.AllElectricCWStorage.mos
diff --git a/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Experimental.DHC.Plants.Combined.Subsystems.Validation.ChillerGroup.mos b/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.DHC.Plants.Combined.Subsystems.Validation.ChillerGroup.mos
similarity index 100%
rename from Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Experimental.DHC.Plants.Combined.Subsystems.Validation.ChillerGroup.mos
rename to Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.DHC.Plants.Combined.Subsystems.Validation.ChillerGroup.mos
diff --git a/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Experimental.DHC.Plants.Combined.Subsystems.Validation.ChillerHeatRecoveryGroup.mos b/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.DHC.Plants.Combined.Subsystems.Validation.ChillerHeatRecoveryGroup.mos
similarity index 100%
rename from Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Experimental.DHC.Plants.Combined.Subsystems.Validation.ChillerHeatRecoveryGroup.mos
rename to Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.DHC.Plants.Combined.Subsystems.Validation.ChillerHeatRecoveryGroup.mos
diff --git a/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Experimental.DHC.Plants.Combined.Subsystems.Validation.CoolingTowerGroup.mos b/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.DHC.Plants.Combined.Subsystems.Validation.CoolingTowerGroup.mos
similarity index 100%
rename from Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Experimental.DHC.Plants.Combined.Subsystems.Validation.CoolingTowerGroup.mos
rename to Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.DHC.Plants.Combined.Subsystems.Validation.CoolingTowerGroup.mos
diff --git a/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Experimental.DHC.Plants.Combined.Subsystems.Validation.HeatPumpGroup.mos b/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.DHC.Plants.Combined.Subsystems.Validation.HeatPumpGroup.mos
similarity index 100%
rename from Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Experimental.DHC.Plants.Combined.Subsystems.Validation.HeatPumpGroup.mos
rename to Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.DHC.Plants.Combined.Subsystems.Validation.HeatPumpGroup.mos
diff --git a/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Experimental.DHC.Plants.Combined.Subsystems.Validation.MultiplePumpsDp.mos b/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.DHC.Plants.Combined.Subsystems.Validation.MultiplePumpsDp.mos
similarity index 100%
rename from Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Experimental.DHC.Plants.Combined.Subsystems.Validation.MultiplePumpsDp.mos
rename to Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.DHC.Plants.Combined.Subsystems.Validation.MultiplePumpsDp.mos
diff --git a/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Experimental.DHC.Plants.Combined.Subsystems.Validation.MultiplePumpsFlow.mos b/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.DHC.Plants.Combined.Subsystems.Validation.MultiplePumpsFlow.mos
similarity index 100%
rename from Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Experimental.DHC.Plants.Combined.Subsystems.Validation.MultiplePumpsFlow.mos
rename to Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.DHC.Plants.Combined.Subsystems.Validation.MultiplePumpsFlow.mos
diff --git a/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Experimental.DHC.Plants.Combined.Subsystems.Validation.MultiplePumpsSpeed.mos b/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.DHC.Plants.Combined.Subsystems.Validation.MultiplePumpsSpeed.mos
similarity index 100%
rename from Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Experimental.DHC.Plants.Combined.Subsystems.Validation.MultiplePumpsSpeed.mos
rename to Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.DHC.Plants.Combined.Subsystems.Validation.MultiplePumpsSpeed.mos
diff --git a/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Experimental.DHC.Plants.Combined.Subsystems.Validation.ValveOpeningFlowBalancing.mos b/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.DHC.Plants.Combined.Subsystems.Validation.ValveOpeningFlowBalancing.mos
similarity index 100%
rename from Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Experimental.DHC.Plants.Combined.Subsystems.Validation.ValveOpeningFlowBalancing.mos
rename to Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.DHC.Plants.Combined.Subsystems.Validation.ValveOpeningFlowBalancing.mos
diff --git a/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Experimental.DHC.Plants.Combined.Validation.AllElectricCWStorage.mos b/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.DHC.Plants.Combined.Validation.AllElectricCWStorage.mos
similarity index 100%
rename from Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Experimental.DHC.Plants.Combined.Validation.AllElectricCWStorage.mos
rename to Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.DHC.Plants.Combined.Validation.AllElectricCWStorage.mos
diff --git a/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Experimental.DHC.Plants.Cooling.BaseClasses.Validation.IdealUser.mos b/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.DHC.Plants.Cooling.BaseClasses.Validation.IdealUser.mos
similarity index 100%
rename from Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Experimental.DHC.Plants.Cooling.BaseClasses.Validation.IdealUser.mos
rename to Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.DHC.Plants.Cooling.BaseClasses.Validation.IdealUser.mos
diff --git a/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Experimental.DHC.Plants.Cooling.Controls.Validation.ChilledWaterBypass.mos b/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.DHC.Plants.Cooling.Controls.Validation.ChilledWaterBypass.mos
similarity index 100%
rename from Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Experimental.DHC.Plants.Cooling.Controls.Validation.ChilledWaterBypass.mos
rename to Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.DHC.Plants.Cooling.Controls.Validation.ChilledWaterBypass.mos
diff --git a/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Experimental.DHC.Plants.Cooling.Controls.Validation.ChilledWaterPumpSpeed.mos b/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.DHC.Plants.Cooling.Controls.Validation.ChilledWaterPumpSpeed.mos
similarity index 100%
rename from Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Experimental.DHC.Plants.Cooling.Controls.Validation.ChilledWaterPumpSpeed.mos
rename to Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.DHC.Plants.Cooling.Controls.Validation.ChilledWaterPumpSpeed.mos
diff --git a/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Experimental.DHC.Plants.Cooling.Controls.Validation.ChillerStage.mos b/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.DHC.Plants.Cooling.Controls.Validation.ChillerStage.mos
similarity index 100%
rename from Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Experimental.DHC.Plants.Cooling.Controls.Validation.ChillerStage.mos
rename to Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.DHC.Plants.Cooling.Controls.Validation.ChillerStage.mos
diff --git a/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Experimental.DHC.Plants.Cooling.Controls.Validation.TankStatus.mos b/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.DHC.Plants.Cooling.Controls.Validation.TankStatus.mos
similarity index 100%
rename from Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Experimental.DHC.Plants.Cooling.Controls.Validation.TankStatus.mos
rename to Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.DHC.Plants.Cooling.Controls.Validation.TankStatus.mos
diff --git a/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Experimental.DHC.Plants.Cooling.Examples.ElectricChillerParallel.mos b/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.DHC.Plants.Cooling.Examples.ElectricChillerParallel.mos
similarity index 100%
rename from Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Experimental.DHC.Plants.Cooling.Examples.ElectricChillerParallel.mos
rename to Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.DHC.Plants.Cooling.Examples.ElectricChillerParallel.mos
diff --git a/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Experimental.DHC.Plants.Cooling.Examples.StoragePlantDualSource.mos b/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.DHC.Plants.Cooling.Examples.StoragePlantDualSource.mos
similarity index 100%
rename from Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Experimental.DHC.Plants.Cooling.Examples.StoragePlantDualSource.mos
rename to Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.DHC.Plants.Cooling.Examples.StoragePlantDualSource.mos
diff --git a/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Experimental.DHC.Plants.Cooling.Subsystems.Examples.CoolingTowersParallel.mos b/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.DHC.Plants.Cooling.Subsystems.Examples.CoolingTowersParallel.mos
similarity index 100%
rename from Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Experimental.DHC.Plants.Cooling.Subsystems.Examples.CoolingTowersParallel.mos
rename to Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.DHC.Plants.Cooling.Subsystems.Examples.CoolingTowersParallel.mos
diff --git a/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Experimental.DHC.Plants.Cooling.Subsystems.Examples.CoolingTowersWithBypass.mos b/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.DHC.Plants.Cooling.Subsystems.Examples.CoolingTowersWithBypass.mos
similarity index 100%
rename from Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Experimental.DHC.Plants.Cooling.Subsystems.Examples.CoolingTowersWithBypass.mos
rename to Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.DHC.Plants.Cooling.Subsystems.Examples.CoolingTowersWithBypass.mos
diff --git a/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Experimental.DHC.Plants.Steam.BaseClasses.Examples.BoilerPolynomial.mos b/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.DHC.Plants.Steam.BaseClasses.Examples.BoilerPolynomial.mos
similarity index 100%
rename from Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Experimental.DHC.Plants.Steam.BaseClasses.Examples.BoilerPolynomial.mos
rename to Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.DHC.Plants.Steam.BaseClasses.Examples.BoilerPolynomial.mos
diff --git a/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Experimental.DHC.Plants.Steam.BaseClasses.Examples.ControlVolumeEvaporation.mos b/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.DHC.Plants.Steam.BaseClasses.Examples.ControlVolumeEvaporation.mos
similarity index 100%
rename from Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Experimental.DHC.Plants.Steam.BaseClasses.Examples.ControlVolumeEvaporation.mos
rename to Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.DHC.Plants.Steam.BaseClasses.Examples.ControlVolumeEvaporation.mos
diff --git a/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Experimental.DHC.Plants.Steam.Examples.SingleBoiler.mos b/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.DHC.Plants.Steam.Examples.SingleBoiler.mos
similarity index 100%
rename from Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Experimental.DHC.Plants.Steam.Examples.SingleBoiler.mos
rename to Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.DHC.Plants.Steam.Examples.SingleBoiler.mos
diff --git a/Buildings/Resources/Scripts/travis/templates/AirHandlersFans.checksum b/Buildings/Resources/Scripts/travis/templates/AirHandlersFans.checksum
index 5aab7c11fb6..3c71bb07d2b 100644
--- a/Buildings/Resources/Scripts/travis/templates/AirHandlersFans.checksum
+++ b/Buildings/Resources/Scripts/travis/templates/AirHandlersFans.checksum
@@ -1 +1 @@
-b3f8f8af4103182b26def7919d0b09ef
+fd7661952d04322c883930bfdccc0026
diff --git a/Buildings/Resources/Scripts/travis/templates/checkandrun.sh b/Buildings/Resources/Scripts/travis/templates/checkandrun.sh
index a1ed2676c3b..6c0861a640b 100755
--- a/Buildings/Resources/Scripts/travis/templates/checkandrun.sh
+++ b/Buildings/Resources/Scripts/travis/templates/checkandrun.sh
@@ -126,7 +126,7 @@ for type in "${!test_script[@]}"; do
     fi
 
     # Diff/master
-    diff_checksum="$(git diff --name-only origin/master | grep Resources/Scripts/travis/templates/$type.checksum)"
+    diff_checksum="$(git diff --name-only origin/master Resources/Scripts/travis/templates | grep Resources/Scripts/travis/templates/$type.checksum)"
     if (( $? == 0 ));  then
       echo "Computed checksum does not match checksum on master."
       if [ "$SKIP" = false ]; then
diff --git a/Buildings/Templates/Plants/HeatPumps/AirToWater.mo b/Buildings/Templates/Plants/HeatPumps/AirToWater.mo
index 39702ac659d..5bda80564b4 100644
--- a/Buildings/Templates/Plants/HeatPumps/AirToWater.mo
+++ b/Buildings/Templates/Plants/HeatPumps/AirToWater.mo
@@ -644,7 +644,12 @@ equation
 <h4>Description</h4>
 <p>
 This template represents an air-to-water heat pump plant
-with closed-loop controls.
+with closed-loop controls. While the heat pump plant configuration can be changed
+through parameters, a typical configuration is shown in the image below.
+</p>
+<p align=\"center\">
+<img alt=\"Image of heat pump plant\"
+src=\"modelica://Buildings/Resources/Images/Templates/Plants/HeatPumps/AirToWater.png\"/>
 </p>
 <p>
 Only identical heat pumps are currently supported.
diff --git a/Buildings/package.mo b/Buildings/package.mo
index 6dc1f4c5250..b58be991542 100644
--- a/Buildings/package.mo
+++ b/Buildings/package.mo
@@ -218,32 +218,33 @@ OpenModelica 1.22.1-1,
 OPTIMICA 1.48.2 and recent versions of Impact.
 </p>
 <p>
-The following major changes have been done compared to release 10.0.0:
+The following major changes have been done compared to release 10.1.0:
 </p>
 <ul>
 <li>
-A tutorial for how to build a simple system model has been added to <code>Buildings.Examples.Tutorial.SimpleHouse</code>.
-</li>
-<li>
-A package for domestic hot water generation and loads that are served by a district system is added to
-<code>Buildings.DHC.Loads.HotWater</code>.
+A package for central plants with reversible air-to-water heat pumps has been added to <code>Buildings.Templates.Plants.HeatPumps</code>.
+The package allows configuration of the type of hydronic integration.
 </li>
 <li>
-The district heating and cooling models have been expanded and revised, user guide has been added, and the models have been
+The models for 1st to 5th generation district heating and cooling systems have been expanded and revised,
+a user guide has been added, and the models have been
 moved from the package <code>Buildings.Experimental.DHC</code> to <code>Buildings.DHC</code>.
 </li>
 <li>
-A package for central plants with reversible air-to-water heat pumps has been added to <code>Buildings.Templates.Plants.HeatPumps</code>.
-The package allows configuration of the type of hydronic integration and it consists pre-configured control sequences.
+A package for domestic hot water generation and loads that are served by a district system has been added to
+<code>Buildings.DHC.Loads.HotWater</code>.
 </li>
 <li>
 The initialization of the Spawn model has been refactored to avoid an iteration between Modelica and EnergyPlus as this
-caused numerical problems in some cases.
+caused numerical problems for some model configurations.
 </li>
 <li>
 The implementation of the blocks for the Control Description Language (CDL), which is being standardized through
 ASHRAE Standard 231P, has been revised to comply with the latest draft of the standard.
 </li>
+<li>
+A tutorial for how to build a simple system model has been added to <code>Buildings.Examples.Tutorial.SimpleHouse</code>.
+</li>
 </ul>
 </div>
 <!-- New libraries -->
@@ -261,7 +262,7 @@ The following <b style=\"color:blue\">new libraries</b> have been added:
     <td valign=\"top\">Tutorial for how to build a simple system model.
     </td>
 </tr>
-<tr><td valign=\"top\">Buildings.Experimental.DHC.Loads.HotWater
+<tr><td valign=\"top\">Buildings.DHC.Loads.HotWater
     </td>
     <td valign=\"top\">Package of models for domestic hot water generation and loads served by district networks.
                        This is for
@@ -285,10 +286,10 @@ to <b style=\"color:blue\">existing</b> libraries:
                        <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/3438\">issue 3438</a>.
     </td>
 </tr>
-<tr><td colspan=\"2\"><b>Buildings.Experimental.DHC.EnergyTransferStations.Combined</b>
+<tr><td colspan=\"2\"><b>Buildings.DHC.ETS.Combined</b>
     </td>
 </tr>
-<tr><td valign=\"top\">Buildings.Experimental.DHC.EnergyTransferStations.Combined.BaseClasses.PartialHeatPumpHeatExchanger
+<tr><td valign=\"top\">Buildings.DHC.ETS.Combined.BaseClasses.PartialHeatPumpHeatExchanger
     </td>
     <td valign=\"top\">Created partial base class to support two versions of the
                        energy transfer station.  One that heats domestic hot
@@ -298,17 +299,17 @@ to <b style=\"color:blue\">existing</b> libraries:
                        <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/3063\">issue 3063</a>.
     </td>
 </tr>
-<tr><td valign=\"top\">Buildings.Experimental.DHC.EnergyTransferStations.Combined.HeatPumpHeatExchangerDHWTank
+<tr><td valign=\"top\">Buildings.DHC.ETS.Combined.HeatPumpHeatExchangerDHWTank
     </td>
     <td valign=\"top\">Version of
-                       <a href=\"Modelica://Buildings.Experimental.DHC.EnergyTransferStations.Combined.HeatPumpHeatExchanger\">
-                       Buildings.Experimental.DHC.EnergyTransferStations.Combined.HeatPumpHeatExchanger</a>
+                       <a href=\"Modelica://Buildings.DHC.ETS.Combined.HeatPumpHeatExchanger\">
+                       Buildings.DHC.ETS.Combined.HeatPumpHeatExchanger</a>
                        that heats domestic hot water with a heat pump plus storage tank and heat exchanger.
                        This is for
                        <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/3063\">issue 3063</a>.
     </td>
 </tr>
-<tr><td valign=\"top\">Buildings.Experimental.DHC.EnergyTransferStations.Combined.Subsystems.BaseClasses.PartialHeatPump
+<tr><td valign=\"top\">Buildings.DHC.ETS.Combined.Subsystems.BaseClasses.PartialHeatPump
     </td>
     <td valign=\"top\">Partial base class to support two versions of heat pump subsystem.
                        One which directly heats water through condenser, and
@@ -318,32 +319,32 @@ to <b style=\"color:blue\">existing</b> libraries:
                        <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/3063\">issue 3063</a>.
     </td>
 </tr>
-<tr><td valign=\"top\">Buildings.Experimental.DHC.EnergyTransferStations.Combined.Subsystems.HeatPumpDHWTank
+<tr><td valign=\"top\">Buildings.DHC.ETS.Combined.Subsystems.HeatPumpDHWTank
     </td>
     <td valign=\"top\">Uses a heat pump to heat water in a storage tank,
                        which can be circulated to heat domestic hot water through a heat exchanger,
                        modeled with
-                       <a href=\"Modelica://Buildings.Experimental.DHC.Loads.HotWater.StorageTankWithExternalHeatExchanger\">
-                       Buildings.Experimental.DHC.Loads.HotWater.StorageTankWithExternalHeatExchanger</a>.
+                       <a href=\"Modelica://Buildings.DHC.Loads.HotWater.StorageTankWithExternalHeatExchanger\">
+                       Buildings.DHC.Loads.HotWater.StorageTankWithExternalHeatExchanger</a>.
                        This is for
                        <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/3063\">issue 3063</a>.
     </td>
 </tr>
-<tr><td valign=\"top\">Buildings.Experimental.DHC.Loads.Combined.BuildingTimeSeriesWithETSWithDHWTank
+<tr><td valign=\"top\">Buildings.DHC.Loads.Combined.BuildingTimeSeriesWithETSWithDHWTank
     </td>
-    <td valign=\"top\">Similar to <a href=\"Modelica://Buildings.Experimental.DHC.Loads.Combined.BuildingTimeSeriesWithETS\">
-                       Buildings.Experimental.DHC.Loads.Combined.BuildingTimeSeriesWithETS</a>,
-                       but uses <a href=\"Modelica://Buildings.Experimental.DHC.EnergyTransferStations.Combined.HeatPumpHeatExchangerDHWTank\">
-                       Buildings.Experimental.DHC.EnergyTransferStations.Combined.HeatPumpHeatExchangerDHWTank</a>
+    <td valign=\"top\">Similar to <a href=\"Modelica://Buildings.DHC.Loads.Combined.BuildingTimeSeriesWithETS\">
+                       Buildings.DHC.Loads.Combined.BuildingTimeSeriesWithETS</a>,
+                       but uses <a href=\"Modelica://Buildings.DHC.ETS.Combined.HeatPumpHeatExchangerDHWTank\">
+                       Buildings.DHC.ETS.Combined.HeatPumpHeatExchangerDHWTank</a>
                        as the ETS.
                        This is for
                        <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/3063\">issue 3063</a>.
     </td>
 </tr>
-<tr><td valign=\"top\">Buildings.Experimental.DHC.Loads.Combined.Examples.BuildingTimeSeriesWithETSDHWTank
+<tr><td valign=\"top\">Buildings.DHC.Loads.Combined.Examples.BuildingTimeSeriesWithETSDHWTank
     </td>
-    <td valign=\"top\">Example model for use of <a href=\"Modelica://Buildings.Experimental.DHC.Loads.Combined.BuildingTimeSeriesWithETSWithDHWTank\">
-                       Buildings.Experimental.DHC.Loads.Combined.BuildingTimeSeriesWithETSWithDHWTank</a>.
+    <td valign=\"top\">Example model for use of <a href=\"Modelica://Buildings.DHC.Loads.Combined.BuildingTimeSeriesWithETSWithDHWTank\">
+                       Buildings.DHC.Loads.Combined.BuildingTimeSeriesWithETSWithDHWTank</a>.
                        This is for
                        <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/3063\">issue 3063</a>.
     </td>
@@ -356,105 +357,105 @@ to <b style=\"color:blue\">existing</b> libraries:
                        <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/3431\">issue 3431</a>.
     </td>
 </tr>
-<tr><td colspan=\"2\"><b>Buildings.Experimental.DHC.Networks</b>
+<tr><td colspan=\"2\"><b>Buildings.DHC.Networks</b>
     </td>
 </tr>
-<tr><td valign=\"top\">Buildings.Experimental.DHC.Networks.Distribution1Pipe_R
+<tr><td valign=\"top\">Buildings.DHC.Networks.Distribution1Pipe_R
     </td>
-    <td valign=\"top\"> Added <a href=\"Modelica://Buildings.Experimental.DHC.Networks.Distribution1Pipe_R\">
-    Buildings.Experimental.DHC.Networks.Distribution1Pipe_R</a>. One pipe distribution network that uses autosize
+    <td valign=\"top\"> Added <a href=\"Modelica://Buildings.DHC.Networks.Distribution1Pipe_R\">
+    Buildings.DHC.Networks.Distribution1Pipe_R</a>. One pipe distribution network that uses autosize
     pipes for supply and lossless for connection. This is for
     <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/3694\">issue 3694</a>.
     </td>
 </tr>
-<tr><td valign=\"top\">Buildings.Experimental.DHC.Networks.Distribution1PipePlugFlow_v
+<tr><td valign=\"top\">Buildings.DHC.Networks.Distribution1PipePlugFlow_v
     </td>
-    <td valign=\"top\"> Added <a href=\"Modelica://Buildings.Experimental.DHC.Networks.Distribution1PipePlugFlow_v\">
-    Buildings.Experimental.DHC.Networks.Distribution1PipePlugFlow_v</a>. One pipe distribution network that uses plugflow
+    <td valign=\"top\"> Added <a href=\"Modelica://Buildings.DHC.Networks.Distribution1PipePlugFlow_v\">
+    Buildings.DHC.Networks.Distribution1PipePlugFlow_v</a>. One pipe distribution network that uses plugflow
     pipes for supply and lossless for connection. This is for
     <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/3694\">issue 3694</a>.
     </td>
 </tr>
-<tr><td valign=\"top\">Buildings.Experimental.DHC.Networks.Distribution2Pipe_R
+<tr><td valign=\"top\">Buildings.DHC.Networks.Distribution2Pipe_R
     </td>
-    <td valign=\"top\"> Added <a href=\"Modelica://Buildings.Experimental.DHC.Networks.Distribution2Pipe_R\">
-    Buildings.Experimental.DHC.Networks.Distribution2Pipe_R</a>. Two pipes network that uses autosize pipes for
+    <td valign=\"top\"> Added <a href=\"Modelica://Buildings.DHC.Networks.Distribution2Pipe_R\">
+    Buildings.DHC.Networks.Distribution2Pipe_R</a>. Two pipes network that uses autosize pipes for
     supply and return, and lossless for connection. This is for
     <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/3694\">issue 3694</a>.
     </td>
 </tr>
-<tr><td colspan=\"2\"><b>Buildings.Experimental.DHC.Networks.Connections</b>
+<tr><td colspan=\"2\"><b>Buildings.DHC.Networks.Connections</b>
     </td>
 </tr>
-<tr><td valign=\"top\">Buildings.Experimental.DHC.Networks.Connections.Connection1Pipe_R
+<tr><td valign=\"top\">Buildings.DHC.Networks.Connections.Connection1Pipe_R
     </td>
-    <td valign=\"top\"> Added <a href=\"Modelica://Buildings.Experimental.DHC.Networks.Connections.Connection1Pipe_R\">
-    Buildings.Experimental.DHC.Networks.Connections.Connection1Pipe_R</a>. One pipe connection model using autosize pipes for supply
+    <td valign=\"top\"> Added <a href=\"Modelica://Buildings.DHC.Networks.Connections.Connection1Pipe_R\">
+    Buildings.DHC.Networks.Connections.Connection1Pipe_R</a>. One pipe connection model using autosize pipes for supply
     and lossless for connection. This is for
     <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/3694\">issue 3694</a>.
     </td>
 </tr>
-<tr><td valign=\"top\">Buildings.Experimental.DHC.Networks.Connections.Connection1PipePlugFlow_v
+<tr><td valign=\"top\">Buildings.DHC.Networks.Connections.Connection1PipePlugFlow_v
     </td>
-    <td valign=\"top\"> Added <a href=\"Modelica://Buildings.Experimental.DHC.Networks.Connections.Connection1PipePlugFlow_v\">
-    Buildings.Experimental.DHC.Networks.Connections.Connection1PipePlugFlow_v</a>. One pipe connection model using plugflow pipes for supply
+    <td valign=\"top\"> Added <a href=\"Modelica://Buildings.DHC.Networks.Connections.Connection1PipePlugFlow_v\">
+    Buildings.DHC.Networks.Connections.Connection1PipePlugFlow_v</a>. One pipe connection model using plugflow pipes for supply
     and lossless for connection. This is for
     <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/3694\">issue 3694</a>.
     </td>
 </tr>
-<tr><td valign=\"top\">Buildings.Experimental.DHC.Networks.Connections.Connection2Pipe_R
+<tr><td valign=\"top\">Buildings.DHC.Networks.Connections.Connection2Pipe_R
     </td>
-    <td valign=\"top\"> Added <a href=\"Modelica://Buildings.Experimental.DHC.Networks.Connections.Connection2Pipe_R\">
-    Buildings.Experimental.DHC.Networks.Connections.Connection2Pipe_R</a>. Two pipes connection model using autosize pipes for supply
+    <td valign=\"top\"> Added <a href=\"Modelica://Buildings.DHC.Networks.Connections.Connection2Pipe_R\">
+    Buildings.DHC.Networks.Connections.Connection2Pipe_R</a>. Two pipes connection model using autosize pipes for supply
     and return, lossless for connection. This is for
     <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/3694\">issue 3694</a>.
     </td>
 </tr>
-<tr><td valign=\"top\">Buildings.Experimental.DHC.Networks.Connections.Examples.Connection1PipeExample
+<tr><td valign=\"top\">Buildings.DHC.Networks.Connections.Examples.Connection1PipeExample
     </td>
-    <td valign=\"top\"> Added <a href=\"Modelica://Buildings.Experimental.DHC.Networks.Connections.Examples.Connection1PipeExample\">
-    Buildings.Experimental.DHC.Networks.Connections.Examples.Connection1PipeExample</a>. Example model for one pipe connections.
+    <td valign=\"top\"> Added <a href=\"Modelica://Buildings.DHC.Networks.Connections.Examples.Connection1PipeExample\">
+    Buildings.DHC.Networks.Connections.Examples.Connection1PipeExample</a>. Example model for one pipe connections.
     This is for <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/3694\">issue 3694</a>.
     </td>
 </tr>
-<tr><td valign=\"top\">Buildings.Experimental.DHC.Networks.Connections.Examples.Connection2PipeExample
+<tr><td valign=\"top\">Buildings.DHC.Networks.Connections.Examples.Connection2PipeExample
     </td>
-    <td valign=\"top\"> Added <a href=\"Modelica://Buildings.Experimental.DHC.Networks.Connections.Examples.Connection2PipeExample\">
-    Buildings.Experimental.DHC.Networks.Connections.Examples.Connection2PipeExample</a>. Example model for two pipes connections.
+    <td valign=\"top\"> Added <a href=\"Modelica://Buildings.DHC.Networks.Connections.Examples.Connection2PipeExample\">
+    Buildings.DHC.Networks.Connections.Examples.Connection2PipeExample</a>. Example model for two pipes connections.
     This is for <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/3694\">issue 3694</a>.
     </td>
 </tr>
-<tr><td colspan=\"2\"><b>Buildings.Experimental.DHC.Networks.Controls</b>
+<tr><td colspan=\"2\"><b>Buildings.DHC.Networks.Controls</b>
     </td>
 </tr>
-<tr><td valign=\"top\">Buildings.Experimental.DHC.Networks.Controls.AgentPump1Pipe
+<tr><td valign=\"top\">Buildings.DHC.Networks.Controls.AgentPump1Pipe
     </td>
-    <td valign=\"top\"> Added <a href=\"Modelica://Buildings.Experimental.DHC.Networks.Controls.AgentPump1Pipe\">
-    Buildings.Experimental.DHC.Networks.Controls.AgentPump1Pipe</a>. Agent controller (i.e. borefield, waste heat plant)
+    <td valign=\"top\"> Added <a href=\"Modelica://Buildings.DHC.Networks.Controls.AgentPump1Pipe\">
+    Buildings.DHC.Networks.Controls.AgentPump1Pipe</a>. Agent controller (i.e. borefield, waste heat plant)
     for one pipe networks. This is for <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/3694\">issue 3694</a>.
     </td>
 </tr>
-<tr><td valign=\"top\">Buildings.Experimental.DHC.Networks.Controls.Examples.AgentPump1PipeExample
+<tr><td valign=\"top\">Buildings.DHC.Networks.Controls.Examples.AgentPump1PipeExample
     </td>
-    <td valign=\"top\"> Added <a href=\"Modelica://Buildings.Experimental.DHC.Networks.Controls.Examples.AgentPump1PipeExample\">
-    Buildings.Experimental.DHC.Networks.Controls.Examples.AgentPump1PipeExample</a>. Example model for AgentPump1Pipe.
+    <td valign=\"top\"> Added <a href=\"Modelica://Buildings.DHC.Networks.Controls.Examples.AgentPump1PipeExample\">
+    Buildings.DHC.Networks.Controls.Examples.AgentPump1PipeExample</a>. Example model for AgentPump1Pipe.
     This is for <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/3694\">issue 3694</a>.
     </td>
 </tr>
-<tr><td valign=\"top\">Buildings.Experimental.DHC.Networks.Controls.Examples.MainPump1PipeExample
+<tr><td valign=\"top\">Buildings.DHC.Networks.Controls.Examples.MainPump1PipeExample
     </td>
-    <td valign=\"top\"> Added <a href=\"Modelica://Buildings.Experimental.DHC.Networks.Controls.Examples.MainPump1PipeExample\">
-    Buildings.Experimental.DHC.Networks.Controls.Examples.MainPump1PipeExample</a>. Example model for MainPump1PipeExample.
+    <td valign=\"top\"> Added <a href=\"Modelica://Buildings.DHC.Networks.Controls.Examples.MainPump1PipeExample\">
+    Buildings.DHC.Networks.Controls.Examples.MainPump1PipeExample</a>. Example model for MainPump1PipeExample.
     This is for <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/3694\">issue 3694</a>.
     </td>
 </tr>
-<tr><td colspan=\"2\"><b>Buildings.Experimental.DHC.Examples.Combined</b>
+<tr><td colspan=\"2\"><b>Buildings.DHC.Examples.Combined</b>
     </td>
 </tr>
-<tr><td valign=\"top\">Buildings.Experimental.DHC.Examples.Combined.SeriesVariableFlowAgentControl
+<tr><td valign=\"top\">Buildings.DHC.Examples.Combined.SeriesVariableFlowAgentControl
     </td>
-    <td valign=\"top\"> Added <a href=\"Modelica://Buildings.Experimental.DHC.Examples.Combined.SeriesVariableFlowAgentControl\">
-    Buildings.Experimental.DHC.Examples.Combined.SeriesVariableFlowAgentControl</a>. This example model showcases a more sophisticated way
+    <td valign=\"top\"> Added <a href=\"Modelica://Buildings.DHC.Examples.Combined.SeriesVariableFlowAgentControl\">
+    Buildings.DHC.Examples.Combined.SeriesVariableFlowAgentControl</a>. This example model showcases a more sophisticated way
     of controlling district agent pumps. This is for <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/3431\">issue 3431</a>.
     </td>
 </tr>
@@ -517,17 +518,17 @@ have been <b style=\"color:blue\">improved</b> in a
                      This is for <a href=\"https://github.com/ibpsa/modelica-ibpsa/issues/1781\">IBPSA, #1781</a>.
     </td>
 </tr>
-<tr><td colspan=\"2\"><b>Buildings.Experimental.DHC.EnergyTransferStations.Heating</b>
+<tr><td colspan=\"2\"><b>Buildings.DHC.ETS.Heating</b>
     </td>
 </tr>
-<tr><td valign=\"top\">Buildings.Experimental.DHC.EnergyTransferStations.Heating.Direct
+<tr><td valign=\"top\">Buildings.DHC.ETS.Heating.Direct
     </td>
     <td valign=\"top\">Documentation corrected for heating.
                        This is for
                        <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/3628\">issue 3628</a>.
     </td>
 </tr>
-<tr><td valign=\"top\">Buildings.Experimental.DHC.EnergyTransferStations.Heating.Indirect
+<tr><td valign=\"top\">Buildings.DHC.ETS.Heating.Indirect
     </td>
     <td valign=\"top\">Documentation corrected for heating.
                        This is for
@@ -592,10 +593,10 @@ have been <b style=\"color:blue\">improved</b> in a
                      This is for <a href=\"https://github.com/ibpsa/modelica-ibpsa/issues/1744\">IBPSA, #1744</a>.
     </td>
 </tr>
-<tr><td colspan=\"2\"><b>Buildings.Experimental.DHC.EnergyTransferStations.BaseClasses  </b>
+<tr><td colspan=\"2\"><b>Buildings.DHC.ETS.BaseClasses  </b>
     </td>
 </tr>
-<tr><td valign=\"top\">Buildings.Experimental.DHC.EnergyTransferStations.BaseClasses.Pump_m_flow
+<tr><td valign=\"top\">Buildings.DHC.ETS.BaseClasses.Pump_m_flow
     </td>
     <td valign=\"top\"> Updated pump model to use
     to <a href=\"Modelica://Buildings.Fluid.Movers.Preconfigured.FlowControlled_m_flow\">
@@ -604,38 +605,38 @@ have been <b style=\"color:blue\">improved</b> in a
     <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/3431\">issue 3431</a>.
     </td>
 </tr>
-<tr><td valign=\"top\">Buildings.Experimental.DHC.EnergyTransferStations.Combined.BaseClasses.PartialHeatPumpHeatExchanger
+<tr><td valign=\"top\">Buildings.DHC.ETS.Combined.BaseClasses.PartialHeatPumpHeatExchanger
     </td>
     <td valign=\"top\"> Reduced <code>swiFlo.dpValve_nominal</code> to numerically zero to avoid reverse flow. This is for
     <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/3431\">issue 3431</a>.
     </td>
 </tr>
-<tr><td colspan=\"2\"><b>Buildings.Experimental.DHC.EnergyTransferStations.Combined.Subsystems.BaseClasses  </b>
+<tr><td colspan=\"2\"><b>Buildings.DHC.ETS.Combined.Subsystems.BaseClasses  </b>
     </td>
 </tr>
-<tr><td valign=\"top\">Buildings.Experimental.DHC.EnergyTransferStations.Combined.Subsystems.BaseClasses.PartialHeatPump
+<tr><td valign=\"top\">Buildings.DHC.ETS.Combined.Subsystems.BaseClasses.PartialHeatPump
     </td>
     <td valign=\"top\"> Converted heat pump model to dynamic by changing <code>heaPum.energyDynamics</code> to
     <code>Modelica.Fluid.Types.Dynamics.FixedInitial</code> and added junction on recirculation loop. This is for
     <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/3431\">issue 3431</a>.
     </td>
 </tr>
-<tr><td colspan=\"2\"><b>Buildings.Experimental.DHC.Examples.Combined  </b>
+<tr><td colspan=\"2\"><b>Buildings.DHC.Examples.Combined  </b>
     </td>
 </tr>
-<tr><td valign=\"top\">Buildings.Experimental.DHC.Examples.Combined.SeriesConstantFlow
+<tr><td valign=\"top\">Buildings.DHC.Examples.Combined.SeriesConstantFlow
     </td>
     <td valign=\"top\"> Added connections that were removed in
-    <a href=\"Modelica://Buildings.Experimental.DHC.Examples.Combined.BaseClasses.PartialSeries\">
-    Buildings.Experimental.DHC.Examples.Combined.BaseClasses.PartialSeries </a>. This is for
+    <a href=\"Modelica://Buildings.DHC.Examples.Combined.BaseClasses.PartialSeries\">
+    Buildings.DHC.Examples.Combined.BaseClasses.PartialSeries </a>. This is for
     <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/3431\">issue 3431</a>.
     </td>
 </tr>
-<tr><td valign=\"top\">Buildings.Experimental.DHC.Examples.Combined.SeriesVariableFlow
+<tr><td valign=\"top\">Buildings.DHC.Examples.Combined.SeriesVariableFlow
     </td>
     <td valign=\"top\"> Added connections that were removed in
-    <a href=\"Modelica://Buildings.Experimental.DHC.Examples.Combined.BaseClasses.PartialSeries\">
-    Buildings.Experimental.DHC.Examples.Combined.BaseClasses.PartialSeries </a>. This is for
+    <a href=\"Modelica://Buildings.DHC.Examples.Combined.BaseClasses.PartialSeries\">
+    Buildings.DHC.Examples.Combined.BaseClasses.PartialSeries </a>. This is for
     <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/3431\">issue 3431</a>.
     </td>
 </tr>
@@ -692,80 +693,88 @@ have been <b style=\"color:blue\">improved</b> in a
                        <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/3526\">issue 3526</a>.
     </td>
 </tr>
-<tr><td colspan=\"2\"><b>Buildings.Experimental.DHC</b>
+<tr><td colspan=\"2\"><b>Buildings.DHC</b>
+    </td>
+</tr>
+<tr><td valign=\"top\">Buildings.Experimental.DHC
+    </td>
+    <td valign=\"top\">The package was renamed to <code>Buildings.DHC</code>,
+                       and the package <code>DHC.EnergyTransferStations</code> was renamed to
+                       <code>DHC.ETS</code>.<br/>
+                       This change is supported in the conversion script.
     </td>
 </tr>
-<tr><td valign=\"top\">Buildings.Experimental.DHC.EnergyTransferStations.BaseClasses.PartialDirect
+<tr><td valign=\"top\">Buildings.DHC.ETS.BaseClasses.PartialDirect
     </td>
     <td valign=\"top\">Change input <code>TSetDisRet</code> to <code>TDisRetSet</code>.
     </td>
 </tr>
-    <tr><td valign=\"top\">Buildings.Experimental.DHC.EnergyTransferStations.BaseClasses.PartialIndirect
+    <tr><td valign=\"top\">Buildings.DHC.ETS.BaseClasses.PartialIndirect
     </td>
     <td valign=\"top\">Change input <code>TSetBuiSup</code> to <code>TBuiSupSet</code>.
     </td>
 </tr>
-<tr><td valign=\"top\">Buildings.Experimental.DHC.EnergyTransferStations.Combined.HeatPumpHeatExchanger
+<tr><td valign=\"top\">Buildings.DHC.ETS.Combined.HeatPumpHeatExchanger
     </td>
     <td valign=\"top\">Extend from new partial base class
-                       <a href=\"Modelica://Buildings.Experimental.DHC.EnergyTransferStations.Combined.BaseClasses.PartialHeatPumpHeatExchanger\">
-                       Buildings.Experimental.DHC.EnergyTransferStations.Combined.BaseClasses.PartialHeatPumpHeatExchanger</a>.
+                       <a href=\"Modelica://Buildings.DHC.ETS.Combined.BaseClasses.PartialHeatPumpHeatExchanger\">
+                       Buildings.DHC.ETS.Combined.BaseClasses.PartialHeatPumpHeatExchanger</a>.
                        Evaporator water flow through space heating and domestic how water heat
                        pumps is constant, with dT across district supply and return controlled by three-way mixing valve.
                        This is for
                        <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/3063\">issue 3063</a>.
     </td>
 </tr>
-<tr><td valign=\"top\">Buildings.Experimental.DHC.EnergyTransferStations.Combined.Subsystems.HeatPump
+<tr><td valign=\"top\">Buildings.DHC.ETS.Combined.Subsystems.HeatPump
     </td>
     <td valign=\"top\">Extend from new partial base class
-                       <a href=\"Modelica://Buildings.Experimental.DHC.EnergyTransferStations.Combined.Subsystems.BaseClasses.PartialHeatPump\">
-                       Buildings.Experimental.DHC.EnergyTransferStations.Combined.Subsystems.BaseClasses.PartialHeatPump</a>.
+                       <a href=\"Modelica://Buildings.DHC.ETS.Combined.Subsystems.BaseClasses.PartialHeatPump\">
+                       Buildings.DHC.ETS.Combined.Subsystems.BaseClasses.PartialHeatPump</a>.
                        Evaporator water flow through heat pump
                        is constant, with dT across district supply and return controlled by three-way mixing valve.
                        This is for
                        <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/3063\">issue 3063</a>.
     </td>
 </tr>
-<tr><td valign=\"top\">Buildings.Experimental.DHC.EnergyTransferStations.Combined.Subsystems.Validation.HeatPump
+<tr><td valign=\"top\">Buildings.DHC.ETS.Combined.Subsystems.Validation.HeatPump
     </td>
     <td valign=\"top\">Validation test for
-                       <a href=\"Modelica://Buildings.Experimental.DHC.EnergyTransferStations.Combined.Subsystems.HeatPump\">
-                       Buildings.Experimental.DHC.EnergyTransferStations.Combined.Subsystems.HeatPump</a>.
+                       <a href=\"Modelica://Buildings.DHC.ETS.Combined.Subsystems.HeatPump\">
+                       Buildings.DHC.ETS.Combined.Subsystems.HeatPump</a>.
                        This is for
                        <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/3063\">issue 3063</a>.
     </td>
 </tr>
-<tr><td valign=\"top\">Buildings.Experimental.DHC.EnergyTransferStations.Combined.Subsystems.Validation.HeatPumpDHWTank
+<tr><td valign=\"top\">Buildings.DHC.ETS.Combined.Subsystems.Validation.HeatPumpDHWTank
     </td>
     <td valign=\"top\">Validation test for
-                       <a href=\"Modelica://Buildings.Experimental.DHC.EnergyTransferStations.Combined.Subsystems.HeatPumpDHWTank\">
-                       Buildings.Experimental.DHC.EnergyTransferStations.Combined.Subsystems.HeatPumpDHWTank</a>.
+                       <a href=\"Modelica://Buildings.DHC.ETS.Combined.Subsystems.HeatPumpDHWTank\">
+                       Buildings.DHC.ETS.Combined.Subsystems.HeatPumpDHWTank</a>.
                        This is for
                        <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/3063\">issue 3063</a>.
     </td>
 </tr>
-<tr><td valign=\"top\">Buildings.Experimental.DHC.Loads.Combined.BuildingTimeSeriesWithETS
+<tr><td valign=\"top\">Buildings.DHC.Loads.Combined.BuildingTimeSeriesWithETS
     </td>
     <td valign=\"top\">Updated to use new version of
-                       <a href=\"Modelica://Buildings.Experimental.DHC.EnergyTransferStations.Combined.HeatPumpHeatExchanger\">
-                       Buildings.Experimental.DHC.EnergyTransferStations.Combined.HeatPumpHeatExchanger</a>
+                       <a href=\"Modelica://Buildings.DHC.ETS.Combined.HeatPumpHeatExchanger\">
+                       Buildings.DHC.ETS.Combined.HeatPumpHeatExchanger</a>
                        as the ETS.
                        This is for
                        <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/3063\">issue 3063</a>.
     </td>
 </tr>
-<tr><td valign=\"top\">Buildings.Experimental.DHC.Plants.Combined.Subsystems.BaseClasses.MultipleCommands
+<tr><td valign=\"top\">Buildings.DHC.Plants.Combined.Subsystems.BaseClasses.MultipleCommands
     </td>
     <td valign=\"top\">The class has been moved to Buildings.Templates.Components.Controls.MultipleCommands.<br/>
                      This is for <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/3536\">#3536</a>.<br/>
                      This change is supported in the conversion script.
     </td>
 </tr>
-<tr><td valign=\"top\">Buildings.Experimental.DHC.Plants.Reservoir.Borefield
+<tr><td valign=\"top\">Buildings.DHC.Plants.Reservoir.Borefield
     </td>
-    <td valign=\"top\">Moved to Buildings.Experimental.DHC.Examples.Combined.BaseClasses.BoreField
-                       <a href=\"Modelica://Buildings.Experimental.DHC.Examples.Combined.BaseClasses.BoreField\"></a>.<br/>
+    <td valign=\"top\">Moved to Buildings.DHC.Examples.Combined.BaseClasses.Borefield
+                       <a href=\"Modelica://Buildings.DHC.Examples.Combined.BaseClasses.Borefield\"></a>.<br/>
                      This is for <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/3628\">#3628</a>.<br/>
                      This change is supported in the conversion script.
     </td>
@@ -828,122 +837,127 @@ have been <b style=\"color:blue\">improved</b> in a
                      This change is supported in the conversion script.
     </td>
 </tr>
-<tr><td colspan=\"2\"><b>Buildings.Experimental.DHC.Networks</b>
+<tr><td colspan=\"2\"><b>Buildings.DHC.Networks</b>
     </td>
 </tr>
-<tr><td valign=\"top\">Buildings.Experimental.DHC.Networks.Connection2Pipe
+<tr><td valign=\"top\">Buildings.DHC.Networks.Connection2Pipe
     </td>
-    <td valign=\"top\">Removed <code>Buildings.Experimental.DHC.Networks.Connection2Pipe</code>.
+    <td valign=\"top\">Removed <code>Buildings.DHC.Networks.Connection2Pipe</code>.
                      This is for <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/3694\">#3694</a>.
     </td>
 </tr>
-<tr><td valign=\"top\">Buildings.Experimental.DHC.Networks.Connection2PipePlugFlow
+<tr><td valign=\"top\">Buildings.DHC.Networks.Connection2PipePlugFlow
     </td>
-    <td valign=\"top\"> Moved and renamed <code>Buildings.Experimental.DHC.Networks.Connection2PipePlugFlow</code>
-    to <a href=\"Modelica://Buildings.Experimental.DHC.Networks.Connections.Connection2PipePlugFlow_v\">
-    Buildings.Experimental.DHC.Networks.Connections.Connection2PipePlugFlow_v </a>. Also updated available paremeters
-    for sizing and heatport configuration. This is for <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/3694\">issue 3694</a>.
+    <td valign=\"top\"> Moved and renamed <code>Buildings.DHC.Networks.Connection2PipePlugFlow</code>
+                     to <a href=\"Modelica://Buildings.DHC.Networks.Connections.Connection2PipePlugFlow_v\">
+                     Buildings.DHC.Networks.Connections.Connection2PipePlugFlow_v </a>. Also updated available paremeters
+                     for sizing and heatport configuration. This is for <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/3694\">issue 3694</a>.<br/>
+                     This change is supported in the conversion script.
     </td>
 </tr>
-<tr><td valign=\"top\">Buildings.Experimental.DHC.Networks.Distribution2Pipe
+<tr><td valign=\"top\">Buildings.DHC.Networks.Distribution2Pipe
     </td>
-    <td valign=\"top\">Removed <code>Buildings.Experimental.DHC.Networks.Distribution2Pipe</code>.
+    <td valign=\"top\">Removed <code>Buildings.DHC.Networks.Distribution2Pipe</code>.
                      This is for <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/3694\">#3694</a>.
     </td>
 </tr>
-<tr><td valign=\"top\">Buildings.Experimental.DHC.Networks.Connection2PipePlugFlow
+<tr><td valign=\"top\">Buildings.DHC.Networks.Connection2PipePlugFlow
     </td>
-    <td valign=\"top\"> Renamed <code>Buildings.Experimental.DHC.Networks.Distribution2PipePlugFlow</code>
-    to <a href=\"Modelica://Buildings.Experimental.DHC.Networks.Distribution2PipePlugFlow_v\">
-    Buildings.Experimental.DHC.Networks.Distribution2PipePlugFlow_v </a>. Also updated available paremeters
-    for sizing and heatport configuration. This is for <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/3694\">issue 3694</a>.
+    <td valign=\"top\"> Renamed <code>Buildings.DHC.Networks.Distribution2PipePlugFlow</code>
+                     to <a href=\"Modelica://Buildings.DHC.Networks.Distribution2PipePlugFlow_v\">
+                     Buildings.DHC.Networks.Distribution2PipePlugFlow_v </a>. Also updated available paremeters
+                     for sizing and heatport configuration. This is for <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/3694\">issue 3694</a>.<br/>
+                     This change is supported in the conversion script.
     </td>
 </tr>
-<tr><td colspan=\"2\"><b>Buildings.Experimental.DHC.Networks.Controls</b>
+<tr><td colspan=\"2\"><b>Buildings.DHC.Networks.Controls</b>
     </td>
 </tr>
-<tr><td valign=\"top\">Buildings.Experimental.DHC.Networks.Connection2PipePlugFlow
+<tr><td valign=\"top\">Buildings.DHC.Networks.Connection2PipePlugFlow
     </td>
-    <td valign=\"top\"> Renamed <code>Buildings.Experimental.DHC.Networks.Controls.MainPump</code>
-    to <a href=\"Modelica://Buildings.Experimental.DHC.Networks.Controls.MainPump1Pipe\">
-    Buildings.Experimental.DHC.Networks.Controls.MainPump1Pipe </a>. Also updated available paremeters
-    and documentation. This is for <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/3694\">issue 3694</a>.
+    <td valign=\"top\"> Renamed <code>Buildings.DHC.Networks.Controls.MainPump</code>
+                     to <a href=\"Modelica://Buildings.DHC.Networks.Controls.MainPump1Pipe\">
+                     Buildings.DHC.Networks.Controls.MainPump1Pipe </a>. Also updated available paremeters
+                     and documentation. This is for <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/3694\">issue 3694</a>.<br/>
+                     This change is supported in the conversion script.
     </td>
 </tr>
-<tr><td colspan=\"2\"><b>Buildings.Experimental.DHC.Networks.Combined </b>
+<tr><td colspan=\"2\"><b>Buildings.DHC.Networks.Combined </b>
     </td>
 </tr>
-<tr><td valign=\"top\">Buildings.Experimental.DHC.Networks.Combined.UnidirectionalParallel
+<tr><td valign=\"top\">Buildings.DHC.Networks.Combined.UnidirectionalParallel
     </td>
-    <td valign=\"top\">Removed <code>Buildings.Experimental.DHC.Networks.Combined.UnidirectionalParallel</code>.
+    <td valign=\"top\">Removed <code>Buildings.DHC.Networks.Combined.UnidirectionalParallel</code>.
                      This is for <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/3694\">#3694</a>.
     </td>
 </tr>
-<tr><td valign=\"top\">Buildings.Experimental.DHC.Networks.Combined.UnidirectionalSeries
+<tr><td valign=\"top\">Buildings.DHC.Networks.Combined.UnidirectionalSeries
     </td>
-    <td valign=\"top\">Removed <code>Buildings.Experimental.DHC.Networks.Combined.UnidirectionalSeries</code>.
+    <td valign=\"top\">Removed <code>Buildings.DHC.Networks.Combined.UnidirectionalSeries</code>.
                      This is for <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/3694\">#3694</a>.
     </td>
 </tr>
-<tr><td colspan=\"2\"><b>Buildings.Experimental.DHC.Networks.Combined.BaseClasses </b>
+<tr><td colspan=\"2\"><b>Buildings.DHC.Networks.Combined.BaseClasses </b>
     </td>
 </tr>
-<tr><td valign=\"top\">Buildings.Experimental.DHC.Networks.Combined.BaseClasses.ConnectionParallelAutosize
+<tr><td valign=\"top\">Buildings.DHC.Networks.Combined.BaseClasses.ConnectionParallelAutosize
     </td>
-    <td valign=\"top\">Removed <code>Buildings.Experimental.DHC.Networks.Combined.BaseClasses.ConnectionParallelAutosize</code>.
+    <td valign=\"top\">Removed <code>Buildings.DHC.Networks.Combined.BaseClasses.ConnectionParallelAutosize</code>.
                      This is for <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/3694\">#3694</a>.
     </td>
 </tr>
-<tr><td valign=\"top\">Buildings.Experimental.DHC.Networks.Combined.BaseClasses.ConnectionParallelStandard
+<tr><td valign=\"top\">Buildings.DHC.Networks.Combined.BaseClasses.ConnectionParallelStandard
     </td>
-    <td valign=\"top\">Removed <code>Buildings.Experimental.DHC.Networks.Combined.BaseClasses.ConnectionParallelStandard</code>.
+    <td valign=\"top\">Removed <code>Buildings.DHC.Networks.Combined.BaseClasses.ConnectionParallelStandard</code>.
                      This is for <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/3694\">#3694</a>.
     </td>
 </tr>
-<tr><td valign=\"top\">Buildings.Experimental.DHC.Networks.Combined.BaseClasses.ConnectionSeriesAutosize
+<tr><td valign=\"top\">Buildings.DHC.Networks.Combined.BaseClasses.ConnectionSeriesAutosize
     </td>
-    <td valign=\"top\">Removed <code>Buildings.Experimental.DHC.Networks.Combined.BaseClasses.ConnectionSeriesAutosize</code>.
+    <td valign=\"top\">Removed <code>Buildings.DHC.Networks.Combined.BaseClasses.ConnectionSeriesAutosize</code>.
                      This is for <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/3694\">#3694</a>.
     </td>
 </tr>
-<tr><td valign=\"top\">Buildings.Experimental.DHC.Networks.Combined.BaseClasses.ConnectionSeriesStandard
+<tr><td valign=\"top\">Buildings.DHC.Networks.Combined.BaseClasses.ConnectionSeriesStandard
     </td>
-    <td valign=\"top\">Removed <code>Buildings.Experimental.DHC.Networks.Combined.BaseClasses.ConnectionSeriesStandard</code>.
+    <td valign=\"top\">Removed <code>Buildings.DHC.Networks.Combined.BaseClasses.ConnectionSeriesStandard</code>.
                      This is for <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/3694\">#3694</a>.
     </td>
 </tr>
-<tr><td valign=\"top\">Buildings.Experimental.DHC.Networks.Combined.BaseClasses.PipeAutosize
+<tr><td valign=\"top\">Buildings.DHC.Networks.Combined.BaseClasses.PipeAutosize
     </td>
-    <td valign=\"top\"> Moved <code>Buildings.Experimental.DHC.Networks.Combined.BaseClasses.PipeAutosize</code>
-    to <a href=\"Modelica://Buildings.Experimental.DHC.Networks.Pipes.PipeAutosize\">
-    Buildings.Experimental.DHC.Networks.Pipes.PipeAutosize</a>.
-    This is for <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/3694\">issue 3694</a>.
+    <td valign=\"top\"> Moved <code>Buildings.DHC.Networks.Combined.BaseClasses.PipeAutosize</code>
+                     to <a href=\"Modelica://Buildings.DHC.Networks.Pipes.PipeAutosize\">
+                     Buildings.DHC.Networks.Pipes.PipeAutosize</a>.
+                     This is for <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/3694\">issue 3694</a>.<br/>
+                     This change is supported in the conversion script.
     </td>
 </tr>
-<tr><td valign=\"top\">Buildings.Experimental.DHC.Networks.Combined.BaseClasses.PipeStandard
+<tr><td valign=\"top\">Buildings.DHC.Networks.Combined.BaseClasses.PipeStandard
     </td>
-    <td valign=\"top\"> Moved <code>Buildings.Experimental.DHC.Networks.Combined.BaseClasses.PipeStandard</code>
-    to <a href=\"Modelica://Buildings.Experimental.DHC.Networks.Pipes.PipeStandard\">
-    Buildings.Experimental.DHC.Networks.Pipes.PipeStandard</a>.
-    This is for <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/3694\">issue 3694</a>.
+    <td valign=\"top\"> Moved <code>Buildings.DHC.Networks.Combined.BaseClasses.PipeStandard</code>
+                     to <a href=\"Modelica://Buildings.DHC.Networks.Pipes.PipeStandard\">
+                     Buildings.DHC.Networks.Pipes.PipeStandard</a>.
+                     This is for <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/3694\">issue 3694</a>.<br/>
+                     This change is supported in the conversion script.
     </td>
 </tr>
-<tr><td valign=\"top\">Buildings.Experimental.DHC.Networks.Combined.BaseClasses.Validation.Pipe
+<tr><td valign=\"top\">Buildings.DHC.Networks.Combined.BaseClasses.Validation.Pipe
     </td>
-    <td valign=\"top\"> Moved <code>Buildings.Experimental.DHC.Networks.Combined.BaseClasses.Validation.Pipe</code>
-    to <a href=\"Modelica://Buildings.Experimental.DHC.Networks.Pipes.Validation.Pipe\">
-    Buildings.Experimental.DHC.Networks.Pipes.Validation.Pipe</a>.
-    This is for <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/3694\">issue 3694</a>.
+    <td valign=\"top\"> Moved <code>Buildings.DHC.Networks.Combined.BaseClasses.Validation.Pipe</code>
+                     to <a href=\"Modelica://Buildings.DHC.Networks.Pipes.Validation.Pipe\">
+                     Buildings.DHC.Networks.Pipes.Validation.Pipe</a>.
+                     This is for <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/3694\">issue 3694</a>.
     </td>
 </tr>
-<tr><td colspan=\"2\"><b>Buildings.Experimental.DHC.Examples.Combined.BaseClasses </b>
+<tr><td colspan=\"2\"><b>Buildings.DHC.Examples.Combined.BaseClasses </b>
     </td>
 </tr>
-<tr><td valign=\"top\">Buildings.Experimental.DHC.Examples.Combined.BaseClasses.PartialSeries
+<tr><td valign=\"top\">Buildings.DHC.Examples.Combined.BaseClasses.PartialSeries
     </td>
     <td valign=\"top\"> Removed several connections to implement
-    to <a href=\"Modelica://Buildings.Experimental.DHC.Examples.Combined.SeriesVariableFlowAgentControl\">
-    Buildings.Experimental.DHC.Examples.Combined.SeriesVariableFlowAgentControl</a>.
+    to <a href=\"Modelica://Buildings.DHC.Examples.Combined.SeriesVariableFlowAgentControl\">
+    Buildings.DHC.Examples.Combined.SeriesVariableFlowAgentControl</a>.
     This is for <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/3431\">issue 3431</a>.
     </td>
 </tr>
@@ -1224,7 +1238,7 @@ Energy Transfer Stations (ETS) with all electric plants with heat recovery chill
 <li>
 ETS with multiple heat pumps (heat recovery as well as air-source heat pumps) and storage, i.e.,
 the so-called Time-Independent Energy Recovery (TIER) plant in
-(<code>Buildings.Experimental.DHC.Plants.Combined.AllElectricCWStorage</code>),
+(<code>Buildings.DHC.Plants.Combined.AllElectricCWStorage</code>),
 </li>
 <li>
 direct and indirect ETS for heating or for cooling, and
@@ -1272,12 +1286,12 @@ The following <b style=\"color:blue\">new libraries</b> have been added:
                        The models are inspired by the ISO 13790:2008 Standard.
     </td>
 </tr>
-<tr><td valign=\"top\">Buildings.Experimental.DHC.EnergyTransferStations.Heating
+<tr><td valign=\"top\">Buildings.DHC.ETS.Heating
     </td>
     <td valign=\"top\">Package containing models for energy transfer stations used in district heating systems.
     </td>
 </tr>
-<tr><td valign=\"top\">Buildings.Experimental.DHC.Loads.Combined.Examples
+<tr><td valign=\"top\">Buildings.DHC.Loads.Combined.Examples
     </td>
     <td valign=\"top\">Package that contains example models of a building
                        with loads provided as time series for heat
@@ -1285,37 +1299,37 @@ The following <b style=\"color:blue\">new libraries</b> have been added:
                        and free cooling in an ambient district network.
     </td>
 </tr>
-<tr><td valign=\"top\">Buildings.Experimental.DHC.Loads.Heating
+<tr><td valign=\"top\">Buildings.DHC.Loads.Heating
     </td>
     <td valign=\"top\">Package containing models for loads in district heating systems.
     </td>
 </tr>
-<tr><td valign=\"top\">Buildings.Experimental.DHC.Plants.Combined
+<tr><td valign=\"top\">Buildings.DHC.Plants.Combined
     </td>
     <td valign=\"top\">Package of models for central plants that provide heating and cooling.
     </td>
 </tr>
-<tr><td valign=\"top\">Buildings.Experimental.DHC.BaseClasses.Steam
+<tr><td valign=\"top\">Buildings.DHC.BaseClasses.Steam
     </td>
     <td valign=\"top\">Package for steam systems using the split-medium approach..
     </td>
 </tr>
-<tr><td valign=\"top\">Buildings.Experimental.DHC.Examples.Steam
+<tr><td valign=\"top\">Buildings.DHC.Examples.Steam
     </td>
     <td valign=\"top\">Package of example models for steam district heating systems.
     </td>
 </tr>
-<tr><td valign=\"top\">Buildings.Experimental.DHC.Loads.Steam
+<tr><td valign=\"top\">Buildings.DHC.Loads.Steam
     </td>
     <td valign=\"top\">Package with models for loads involving steam systems.
     </td>
 </tr>
-<tr><td valign=\"top\">Buildings.Experimental.DHC.Networks.Steam
+<tr><td valign=\"top\">Buildings.DHC.Networks.Steam
     </td>
     <td valign=\"top\">Package of models for distribution networks involving steam.
     </td>
 </tr>
-<tr><td valign=\"top\">Buildings.Experimental.DHC.Plants.Steam
+<tr><td valign=\"top\">Buildings.DHC.Plants.Steam
     </td>
     <td valign=\"top\">Package with models for steam plants.
     </td>
@@ -1364,21 +1378,21 @@ to <b style=\"color:blue\">existing</b> libraries:
                        <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/3103\">issue 3103</a>.
     </td>
 </tr>
-<tr><td colspan=\"2\"><b>Buildings.Experimental.DHC.Plants.Cooling</b>
+<tr><td colspan=\"2\"><b>Buildings.DHC.Plants.Cooling</b>
     </td>
 </tr>
-<tr><td valign=\"top\">Buildings.Experimental.DHC.Plants.Cooling.StoragePlant<br/>
-                       Buildings.Experimental.DHC.Plants.Cooling.Controls.FlowControl<br/>
-                       Buildings.Experimental.DHC.Plants.Cooling.Controls.SelectMin<br/>
-                       Buildings.Experimental.DHC.Plants.Cooling.Controls.TankStatus<br/>
-                       Buildings.Experimental.DHC.Plants.Cooling.Controls.Validation.TankStatus<br/>
-                       Buildings.Experimental.DHC.Plants.Cooling.Examples.StoragePlantDualSource<br/>
-                       Buildings.Experimental.DHC.Plants.Cooling.BaseClasses.IdealUser<br/>
-                       Buildings.Experimental.DHC.Plants.Cooling.BaseClasses.ParallelJunctions<br/>
-                       Buildings.Experimental.DHC.Plants.Cooling.BaseClasses.ParallelPipes<br/>
-                       Buildings.Experimental.DHC.Plants.Cooling.BaseClasses.ReversibleConnection<br/>
-                       Buildings.Experimental.DHC.Plants.Cooling.BaseClasses.TankBranch<br/>
-                       Buildings.Experimental.DHC.Plants.Cooling.BaseClasses.Validation.IdealUser
+<tr><td valign=\"top\">Buildings.DHC.Plants.Cooling.StoragePlant<br/>
+                       Buildings.DHC.Plants.Cooling.Controls.FlowControl<br/>
+                       Buildings.DHC.Plants.Cooling.Controls.SelectMin<br/>
+                       Buildings.DHC.Plants.Cooling.Controls.TankStatus<br/>
+                       Buildings.DHC.Plants.Cooling.Controls.Validation.TankStatus<br/>
+                       Buildings.DHC.Plants.Cooling.Examples.StoragePlantDualSource<br/>
+                       Buildings.DHC.Plants.Cooling.BaseClasses.IdealUser<br/>
+                       Buildings.DHC.Plants.Cooling.BaseClasses.ParallelJunctions<br/>
+                       Buildings.DHC.Plants.Cooling.BaseClasses.ParallelPipes<br/>
+                       Buildings.DHC.Plants.Cooling.BaseClasses.ReversibleConnection<br/>
+                       Buildings.DHC.Plants.Cooling.BaseClasses.TankBranch<br/>
+                       Buildings.DHC.Plants.Cooling.BaseClasses.Validation.IdealUser
     </td>
     <td valign=\"top\">Added models for a district CHW system with two plants,
                        where one of them has a storage tank that can be charged remotely by the other plant.<br/>
@@ -1491,10 +1505,10 @@ have been <b style=\"color:blue\">improved</b> in a
                        This is for <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/3257\">issue 3257</a>.
     </td>
 </tr>
-<tr><td colspan=\"2\"><b>Buildings.Experimental.DHC.Plants.Cooling</b>
+<tr><td colspan=\"2\"><b>Buildings.DHC.Plants.Cooling</b>
     </td>
 </tr>
-<tr><td valign=\"top\">Buildings.Experimental.DHC.Plants.Cooling.Controls.ChilledWaterPumpSpeed
+<tr><td valign=\"top\">Buildings.DHC.Plants.Cooling.Controls.ChilledWaterPumpSpeed
     </td>
     <td valign=\"top\">Set <code>final totPum.nin = numPum</code> so that this block is restricted
                        to a two-pump configuration as intended.
@@ -1618,7 +1632,7 @@ have been <b style=\"color:blue\">improved</b> in a
 </tr>
 <tr><td colspan=\"2\"><b>Buildings.Experimental</b>
 </td>
-<tr><td valign=\"top\">Buildings.Experimental.DHC.Loads.BaseClasses.Examples.BaseClasses.BuildingTimeSeries
+<tr><td valign=\"top\">Buildings.DHC.Loads.BaseClasses.Examples.BaseClasses.BuildingTimeSeries
     </td>
     <td valign=\"top\">Compute the scaling parameters based on the peak loads
                         and revise documentation.<br/>
@@ -1626,7 +1640,7 @@ have been <b style=\"color:blue\">improved</b> in a
                         <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/2302\">#2302</a>.
     </td>
 </tr>
-<tr><td valign=\"top\">Buildings.Experimental.DHC.Networks.Connection2Pipe
+<tr><td valign=\"top\">Buildings.DHC.Networks.Connection2Pipe
     </td>
     <td valign=\"top\">Removed renamed model redeclare to solve error and allow separate pipe
                        declarations on sup/ret of DHC networks.<br/>
@@ -1634,7 +1648,7 @@ have been <b style=\"color:blue\">improved</b> in a
                         <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/2905\">#2905</a>.
     </td>
 </tr>
-<tr><td valign=\"top\">Buildings.Experimental.DHC.Networks.Connection2PipePlugFlow
+<tr><td valign=\"top\">Buildings.DHC.Networks.Connection2PipePlugFlow
     </td>
     <td valign=\"top\">Fix redeclare of dis pipe models in connections.<br/>
                         This is for
@@ -2035,21 +2049,21 @@ have been <b style=\"color:blue\">improved</b> in a
     <td valign=\"top\">Changed control that enables the heating system.
     </td>
 </tr>
-<tr><td colspan=\"2\"><b>Buildings.Experimental.DHC.Plants</b>
+<tr><td colspan=\"2\"><b>Buildings.DHC.Plants</b>
     </td>
 </tr>
-<tr><td valign=\"top\">Buildings.Experimental.DHC.Plants.Combined.Controls.BaseClasses.ModeCondenserLoop
+<tr><td valign=\"top\">Buildings.DHC.Plants.Combined.Controls.BaseClasses.ModeCondenserLoop
     </td>
     <td valign=\"top\">Because of the removal of <code>Logical.And3</code> based on ASHRAE 231P,
                        replaced it with a stack of two <code>Logical.And</code> blocks.<br/>
                        This is for <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/2465\">#2465</a>.
     </td>
 </tr>
-<tr><td colspan=\"2\"><b>Buildings.Experimental.DHC.Loads</b>
+<tr><td colspan=\"2\"><b>Buildings.DHC.Loads</b>
     </td>
 </tr>
-<tr><td valign=\"top\">Buildings.Experimental.DHC.Loads.BaseClasses.FlowDistribution<br/>
-                       Buildings.Experimental.DHC.Loads.BaseClasses.Validation.FlowDistributionPumpControl
+<tr><td valign=\"top\">Buildings.DHC.Loads.BaseClasses.FlowDistribution<br/>
+                       Buildings.DHC.Loads.BaseClasses.Validation.FlowDistributionPumpControl
     </td>
     <td valign=\"top\">Swapped the pump models for preconfigured versions.<br/>
                        This is for
@@ -2291,7 +2305,7 @@ that can lead to wrong simulation results):
   <tr><td colspan=\"2\"><b>Buildings.Experimental</b>
     </td>
   </tr>
-<tr><td valign=\"top\">Buildings.Experimental.DHC.EnergyTransferStations.Combined.HeatPumpHeatExchanger
+<tr><td valign=\"top\">Buildings.DHC.ETS.Combined.HeatPumpHeatExchanger
   </td>
   <td valign=\"top\">Assigned dp_nominal to <code>pum1HexChi</code>.<br/>
                      Corrected calculation of heat pump evaporator mass flow control.<br/>
@@ -2300,7 +2314,7 @@ that can lead to wrong simulation results):
                      issue 3379</a>.
   </td>
 </tr>
-<tr><td valign=\"top\">Buildings.Experimental.DHC.EnergyTransferStations.Combined.Subsystems.HeatPump
+<tr><td valign=\"top\">Buildings.DHC.ETS.Combined.Subsystems.HeatPump
   </td>
   <td valign=\"top\">Assigned dp_nominal to condenser pump.<br/>
                      This is for
@@ -2308,7 +2322,7 @@ that can lead to wrong simulation results):
                      issue 3379</a>.
   </td>
 </tr>
-<tr><td valign=\"top\">Buildings.Experimental.DHC.EnergyTransferStations.Cooling.Indirect
+<tr><td valign=\"top\">Buildings.DHC.ETS.Cooling.Indirect
   </td>
   <td valign=\"top\">Fixed building supply temperature controller parameter <code>reverseActing</code>
                      by changing from <code>true</code> to <code>false</code>.<br/>
@@ -2317,13 +2331,13 @@ that can lead to wrong simulation results):
                      issue 3299</a>.
   </td>
 </tr>
-<tr><td valign=\"top\">Buildings.Experimental.DHC.EnergyTransferStations.Cooling.Direct
+<tr><td valign=\"top\">Buildings.DHC.ETS.Cooling.Direct
   </td>
   <td valign=\"top\">Removed assignment of check valve <code>allowFlowReversal=false</code>.<br/>
                      This is for <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/3389\">#3389</a>.
   </td>
 </tr>
-<tr><td valign=\"top\">Buildings.Experimental.DHC.Loads.BaseClasses.Examples.BaseClasses.BuildingTimeSeries
+<tr><td valign=\"top\">Buildings.DHC.Loads.BaseClasses.Examples.BaseClasses.BuildingTimeSeries
   </td>
   <td valign=\"top\">Applied <code>facMul</code> to domestic hot water load.<br/>
                      This is for
@@ -2948,13 +2962,13 @@ to <b style=\"color:blue\">existing</b> libraries:
                        <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/3125\">#3125</a>.
     </td>
   </tr>
-<tr><td colspan=\"2\"><b>Buildings.Experimental.DHC.Networks.Combined.BaseClasses</b>
+<tr><td colspan=\"2\"><b>Buildings.DHC.Networks.Combined.BaseClasses</b>
     </td>
 </tr>
-<tr><td valign=\"top\">Buildings.Experimental.DHC.Networks.Combined.BaseClasses.Validation.Pipe
+<tr><td valign=\"top\">Buildings.DHC.Networks.Combined.BaseClasses.Validation.Pipe
     </td>
-    <td valign=\"top\">Test for comparing <code>Buildings.Experimental.DHC.Networks.Combined.BaseClasses.PipeAutosize</code> <br/>
-                       initialization of <code>dh</code> to <code>Buildings.Experimental.DHC.Networks.Combined.BaseClasses.PipeStandard</code>.<br/>
+    <td valign=\"top\">Test for comparing <code>Buildings.DHC.Networks.Combined.BaseClasses.PipeAutosize</code> <br/>
+                       initialization of <code>dh</code> to <code>Buildings.DHC.Networks.Combined.BaseClasses.PipeStandard</code>.<br/>
                        This is for <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/2510\">issue #2510</a>.
     </td>
 </tr>
@@ -2996,18 +3010,18 @@ have been <b style=\"color:blue\">improved</b> in a
                        <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/3106\">#3106</a>.
     </td>
   </tr>
-  <tr><td colspan=\"2\"><b>Buildings.Experimental.DHC</b>
+  <tr><td colspan=\"2\"><b>Buildings.DHC</b>
     </td>
   </tr>
-  <tr><td valign=\"top\">Buildings.Experimental.DHC.EnergyTransferStations.BaseClasses.Validation.CollectorDistributor<br/>
-                         Buildings.Experimental.DHC.EnergyTransferStations.Combined.Subsystems.HeatPump<br/>
-                         Buildings.Experimental.DHC.Examples.Combined.BaseClasses.PartialSeries<br/>
-                         Buildings.Experimental.DHC.Plants.Cooling.ElectricChillerParallel<br/>
-                         Buildings.Experimental.DHC.Plants.Cooling.Examples.ElectricChillerParallel<br/>
-                         Buildings.Experimental.DHC.Plants.Cooling.Subsystems.CoolingTowersParallel<br/>
-                         Buildings.Experimental.DHC.Plants.Cooling.Subsystems.CoolingTowersWithBypass<br/>
-                         Buildings.Experimental.DHC.Plants.Cooling.Subsystems.Examples.BaseClasses.PartialCoolingTowersSubsystem<br/>
-                         Buildings.Experimental.DHC.Plants.Cooling.Subsystems.Examples.CoolingTowersParallel
+  <tr><td valign=\"top\">Buildings.DHC.ETS.BaseClasses.Validation.CollectorDistributor<br/>
+                         Buildings.DHC.ETS.Combined.Subsystems.HeatPump<br/>
+                         Buildings.DHC.Examples.Combined.BaseClasses.PartialSeries<br/>
+                         Buildings.DHC.Plants.Cooling.ElectricChillerParallel<br/>
+                         Buildings.DHC.Plants.Cooling.Examples.ElectricChillerParallel<br/>
+                         Buildings.DHC.Plants.Cooling.Subsystems.CoolingTowersParallel<br/>
+                         Buildings.DHC.Plants.Cooling.Subsystems.CoolingTowersWithBypass<br/>
+                         Buildings.DHC.Plants.Cooling.Subsystems.Examples.BaseClasses.PartialCoolingTowersSubsystem<br/>
+                         Buildings.DHC.Plants.Cooling.Subsystems.Examples.CoolingTowersParallel
     </td>
     <td valign=\"top\">Improved implementation to avoid high pressures due to pump with forced mass flow rate.<br/>
                        This is for
@@ -3088,10 +3102,10 @@ have been <b style=\"color:blue\">improved</b> in a
                        This is for <a href=\"https://github.com/ibpsa/modelica-ibpsa/pull/1640\">IBPSA, issue #1640</a>.
     </td>
 </tr>
-<tr><td colspan=\"2\"><b>Buildings.Experimental.DHC.Networks.Combined.BaseClasses</b>
+<tr><td colspan=\"2\"><b>Buildings.DHC.Networks.Combined.BaseClasses</b>
     </td>
 </tr>
-<tr><td valign=\"top\">Buildings.Experimental.DHC.Networks.Combined.BaseClasses.PipeAutosize
+<tr><td valign=\"top\">Buildings.DHC.Networks.Combined.BaseClasses.PipeAutosize
     </td>
     <td valign=\"top\"><code>start</code> attribute for parameter <code>dh</code> changed to 0.01.<br/>
                        <code>min</code> attribute for parameter <code>dh</code> changed to 0.001.<br/>
@@ -3143,10 +3157,10 @@ that can lead to wrong simulation results):
                        This is for <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/3095\">issue 3095</a>.
     </td>
 </tr>
-<tr><td colspan=\"2\"><b>Buildings.Experimental.DHC.Plants.Cooling</b>
+<tr><td colspan=\"2\"><b>Buildings.DHC.Plants.Cooling</b>
     </td>
 </tr>
-<tr><td valign=\"top\">Buildings.Experimental.DHC.Plants.Cooling.ElectricChillerParallel
+<tr><td valign=\"top\">Buildings.DHC.Plants.Cooling.ElectricChillerParallel
     </td>
     <td valign=\"top\">Corrected wrong assignments for chiller system <code>mulChiSys</code> which assigned chilled water
                      to condenser water parameters and vice versa.
@@ -3649,10 +3663,10 @@ have been <b style=\"color:blue\">improved</b> in a
     </td>
     <td valign=\"top\">Set <code>nominalValuesDefaultPressureCurve=true</code> to avoid warnings.<br/>
                        This is for <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/2761\">Buildings, #2761</a>.
-<tr><td colspan=\"2\"><b>Buildings.Experimental.DHC</b>
+<tr><td colspan=\"2\"><b>Buildings.DHC</b>
     </td>
 </tr>
-<tr><td valign=\"top\">Buildings.Experimental.DHC.Plants.Cooling
+<tr><td valign=\"top\">Buildings.DHC.Plants.Cooling
     </td>
     <td valign=\"top\">Revised the model for extensibility. <br/>
     This is for <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/2749\">#2749</a>.
@@ -3741,10 +3755,10 @@ have been <b style=\"color:blue\">improved</b> in a
                        This is for <a href=\"https://github.com/ibpsa/modelica-ibpsa/pull/1531\">IBPSA #1531</a>.
     </td>
 </tr>
-<tr><td colspan=\"2\"><b>Buildings.Experimental.DHC</b>
+<tr><td colspan=\"2\"><b>Buildings.DHC</b>
     </td>
 </tr>
-<tr><td valign=\"top\">Buildings.Experimental.DHC.Plants.Cooling.Subsystems.Examples.BaseClasses.PartialCoolingTowersSubsystem
+<tr><td valign=\"top\">Buildings.DHC.Plants.Cooling.Subsystems.Examples.BaseClasses.PartialCoolingTowersSubsystem
     </td>
     <td valign=\"top\">Added a temperature sensor for better measurement of the entering water temperature.<br/>
                        This is for <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/2866\">#2866</a>.
@@ -4134,10 +4148,10 @@ that can lead to wrong simulation results):
 </tr>
 
 
-<tr><td colspan=\"2\"><b>Buildings.Experimental.DHC</b>
+<tr><td colspan=\"2\"><b>Buildings.DHC</b>
     </td>
 </tr>
-<tr><td valign=\"top\">Buildings.Experimental.DHC.Examples.Combined.ParallelConstantFlow
+<tr><td valign=\"top\">Buildings.DHC.Examples.Combined.ParallelConstantFlow
     </td>
     <td valign=\"top\">Removed the model that represented an incorrect hydronic configuration. <br/>
     This is for <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/2967\">#2967</a>.
@@ -4248,7 +4262,7 @@ units are wrong or errors in documentation):
   <tr><td colspan=\"2\"><b>Buildings.Experimental</b>
     </td>
 </tr>
-<tr><td valign=\"top\">Buildings.Experimental.DHC.Plants.Cooling.Controls.ChillerStage
+<tr><td valign=\"top\">Buildings.DHC.Plants.Cooling.Controls.ChillerStage
     </td>
     <td valign=\"top\">Corrected parameter value for <code>twoOn.nOut</code>.
                        This correction is required to simulate the model in Dymola 2022
@@ -4494,10 +4508,10 @@ The following <b style=\"color:red\">critical errors</b> have been fixed (i.e.,
 that can lead to wrong simulation results):
 </p>
 <table class=\"releaseTable\" summary=\"summary\" border=\"1\" cellspacing=\"0\" cellpadding=\"2\" style=\"border-collapse:collapse;\">
-<tr><td colspan=\"2\"><b>Buildings.Experimental.DHC</b>
+<tr><td colspan=\"2\"><b>Buildings.DHC</b>
     </td>
 </tr>
-<tr><td valign=\"top\">Buildings.Experimental.DHC.Examples.Combined.ParallelConstantFlow
+<tr><td valign=\"top\">Buildings.DHC.Examples.Combined.ParallelConstantFlow
     </td>
     <td valign=\"top\">Removed the model that represented an incorrect hydronic configuration. <br/>
     This is for <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/2967\">#2967</a>.
@@ -4535,7 +4549,7 @@ units are wrong or errors in documentation):
 <tr><td colspan=\"2\"><b>Buildings.Experimental</b>
     </td>
 </tr>
-<tr><td valign=\"top\">Buildings.Experimental.DHC.CentralPlants.Cooling.Controls.ChillerStage
+<tr><td valign=\"top\">Buildings.DHC.CentralPlants.Cooling.Controls.ChillerStage
     </td>
     <td valign=\"top\">Corrected parameter value for <code>twoOn.nOut</code>.
                        This correction is required to simulate the model in Dymola 2022
@@ -4623,9 +4637,9 @@ units are wrong or errors in documentation):
                            such for pipes embedded in the concrete slab.
         </td>
     </tr>
-    <tr><td colspan=\"2\"><b>Buildings.Experimental.DHC</b>
+    <tr><td colspan=\"2\"><b>Buildings.DHC</b>
         </td>
-    <tr><td valign=\"top\">Buildings.Experimental.DHC.Plants.Cooling
+    <tr><td valign=\"top\">Buildings.DHC.Plants.Cooling
         </td>
         <td valign=\"top\">Package with models for a chilled water plant adapted to
         district cooling applications.<br/>
@@ -4888,7 +4902,7 @@ heat and light transmission through the windows for the current control signal o
 </li>
 <li>
 The package
-<code>Buildings.Experimental.DHC</code> contains models for district heating and cooling systems
+<code>Buildings.DHC</code> contains models for district heating and cooling systems
 that are being developed for the URBANopt District Energy System software.
 </li>
 <li>
@@ -4934,7 +4948,7 @@ The following <b style=\"color:blue\">new libraries</b> have been added:
 <tr><td colspan=\"2\"><b>Buildings.Experimental</b>
     </td>
 </tr>
-<tr><td valign=\"top\">Buildings.Experimental.DHC
+<tr><td valign=\"top\">Buildings.DHC
     </td>
     <td valign=\"top\">Packages for modeling district heating
                        and cooling systems.<br/>
@@ -5537,7 +5551,7 @@ have been <b style=\"color:blue\">improved</b> in a
     </td>
     <td valign=\"top\">Moved package to <code>Buildings.Obsolete.DistrictHeatingCooling</code>.<br/>
                        Generic components for DHC system modeling are now developed under
-                       <code>Buildings.Experimental.DHC</code>.
+                       <code>Buildings.DHC</code>.
     </td>
 </tr>
 </table>
@@ -13892,6 +13906,8 @@ The following people have directly contributed to the implementation of the Buil
 </li>
 <li>Rainer Czetina, University of Applied Sciences Technikum Wien, Austria
 </li>
+<li>Karthikeya Devaprasad, Pacific Northwest National Laboratory, USA
+</li>
 <li>Hagar Elarga, Lawrence Berkeley National Laboratory, USA
 </li>
 <li>Hongxiang \"Casper\" Fu, Lawrence Berkeley National Laboratory, USA
@@ -13926,6 +13942,8 @@ The following people have directly contributed to the implementation of the Buil
 </li>
 <li>Xiufeng Pang, Lawrence Berkeley National Laboratory, USA
 </li>
+<li>Remi Patureau, Lawrence Berkeley National Laboratory, USA
+</li>
 <li>Damien Picard, KU Leuven, Belgium
 </li>
 <li>Kaustubh Phalak, Lawrence Berkeley National Laboratory, USA
@@ -14136,7 +14154,7 @@ particular package.<br/>
    </td>
    <td valign=\"top\">Package with the Control Description Language (CDL) and with control sequences that are implemented using CDL.</td>
 </tr>
-<tr><td valign=\"top\"><a href=\"modelica://Buildings.Experimental.DHC\">Experimental.DHC</a>
+<tr><td valign=\"top\"><a href=\"modelica://Buildings.DHC\">DHC</a>
    </td>
    <td valign=\"top\">Package with models for district heating and cooling systems.</td>
 </tr>
diff --git a/Buildings/package.order b/Buildings/package.order
index dbc4ec10240..1d19cee1b0f 100644
--- a/Buildings/package.order
+++ b/Buildings/package.order
@@ -4,6 +4,7 @@ Airflow
 Applications
 BoundaryConditions
 Controls
+DHC
 Electrical
 Fluid
 HeatTransfer
@@ -14,6 +15,5 @@ ThermalZones
 Utilities
 Types
 Examples
-Experimental
 BaseClasses
 Obsolete