ORNL · pelesh · Jun 11, 2024 · Jun 6, 2024 · Jun 6, 2024 · Jun 7, 2024
diff --git a/ComponentLib/CMakeLists.txt b/ComponentLib/CMakeLists.txt
@@ -60,14 +60,6 @@
 #    - Cameron Rutherford <cameron.rutherford@pnnl.gov>
 #]]
 
-add_subdirectory(Branch)
-add_subdirectory(Bus)
-add_subdirectory(Generator)
-add_subdirectory(Generator2)
-add_subdirectory(Generator4)
-add_subdirectory(Generator4Governor)
-add_subdirectory(Generator4Param)
-add_subdirectory(Load)
-add_subdirectory(MiniGrid)
-add_subdirectory(PowerElectronicsComponents)
+add_subdirectory(PowerFlow)
+add_subdirectory(PowerElectronics)
 
diff --git a/ComponentLib/Exciter/README.md → ComponentLib/DynamicPhasor/Exciter/README.md b/ComponentLib/Exciter/README.md → ComponentLib/DynamicPhasor/Exciter/README.md
diff --git a/ComponentLib/Governor/README.md → ...onentLib/DynamicPhasor/Governor/README.md b/ComponentLib/Governor/README.md → ...onentLib/DynamicPhasor/Governor/README.md
diff --git a/ComponentLib/Stabilizer/README.md → ...entLib/DynamicPhasor/Stabilizer/README.md b/ComponentLib/Stabilizer/README.md → ...entLib/DynamicPhasor/Stabilizer/README.md
diff --git a/...Lib/SynchronousMachine/GENROUwS/README.md → ...sor/SynchronousMachine/GENROUwS/README.md b/...Lib/SynchronousMachine/GENROUwS/README.md → ...sor/SynchronousMachine/GENROUwS/README.md
diff --git a/...Lib/SynchronousMachine/GENSALwS/README.md → ...sor/SynchronousMachine/GENSALwS/README.md b/...Lib/SynchronousMachine/GENSALwS/README.md → ...sor/SynchronousMachine/GENSALwS/README.md
diff --git a/ComponentLib/SynchronousMachine/README.md → ...ynamicPhasor/SynchronousMachine/README.md b/ComponentLib/SynchronousMachine/README.md → ...ynamicPhasor/SynchronousMachine/README.md
diff --git a/...PowerElectronicsComponents/CMakeLists.txt → ComponentLib/PowerElectronics/CMakeLists.txt b/...PowerElectronicsComponents/CMakeLists.txt → ComponentLib/PowerElectronics/CMakeLists.txt
diff --git a/...ronicsComponents/Capacitor/CMakeLists.txt → ...PowerElectronics/Capacitor/CMakeLists.txt b/...ronicsComponents/Capacitor/CMakeLists.txt → ...PowerElectronics/Capacitor/CMakeLists.txt
diff --git a/...tronicsComponents/Capacitor/Capacitor.cpp → .../PowerElectronics/Capacitor/Capacitor.cpp b/...tronicsComponents/Capacitor/Capacitor.cpp → .../PowerElectronics/Capacitor/Capacitor.cpp
diff --git a/...tronicsComponents/Capacitor/Capacitor.hpp → .../PowerElectronics/Capacitor/Capacitor.hpp b/...tronicsComponents/Capacitor/Capacitor.hpp → .../PowerElectronics/Capacitor/Capacitor.hpp
@@ -5,7 +5,7 @@
 
 #include <ModelEvaluatorImpl.hpp>
 #include <PowerSystemData.hpp>
-#include <ComponentLib/PowerElectronicsComponents/CircuitComponent.hpp>
+#include <ComponentLib/PowerElectronics/CircuitComponent.hpp>
 
 
 namespace ModelLib

diff --git a/...lectronicsComponents/CircuitComponent.hpp → ...Lib/PowerElectronics/CircuitComponent.hpp b/...lectronicsComponents/CircuitComponent.hpp → ...Lib/PowerElectronics/CircuitComponent.hpp
diff --git a/...nents/DistributedGenerator/CMakeLists.txt → ...onics/DistributedGenerator/CMakeLists.txt b/...nents/DistributedGenerator/CMakeLists.txt → ...onics/DistributedGenerator/CMakeLists.txt
diff --git a/...ributedGenerator/DistributedGenerator.cpp → ...ributedGenerator/DistributedGenerator.cpp b/...ributedGenerator/DistributedGenerator.cpp → ...ributedGenerator/DistributedGenerator.cpp
diff --git a/...ributedGenerator/DistributedGenerator.hpp → ...ributedGenerator/DistributedGenerator.hpp b/...ributedGenerator/DistributedGenerator.hpp → ...ributedGenerator/DistributedGenerator.hpp
@@ -5,7 +5,7 @@
 
 #include <ModelEvaluatorImpl.hpp>
 #include <PowerSystemData.hpp>
-#include <ComponentLib/PowerElectronicsComponents/CircuitComponent.hpp>
+#include <ComponentLib/PowerElectronics/CircuitComponent.hpp>
 
 
 namespace ModelLib

diff --git a/...sComponents/InductionMotor/CMakeLists.txt → ...Electronics/InductionMotor/CMakeLists.txt b/...sComponents/InductionMotor/CMakeLists.txt → ...Electronics/InductionMotor/CMakeLists.txt
diff --git a/...ponents/InductionMotor/InductionMotor.cpp → ...tronics/InductionMotor/InductionMotor.cpp b/...ponents/InductionMotor/InductionMotor.cpp → ...tronics/InductionMotor/InductionMotor.cpp
diff --git a/...ponents/InductionMotor/InductionMotor.hpp → ...tronics/InductionMotor/InductionMotor.hpp b/...ponents/InductionMotor/InductionMotor.hpp → ...tronics/InductionMotor/InductionMotor.hpp
@@ -5,7 +5,7 @@
 
 #include <ModelEvaluatorImpl.hpp>
 #include <PowerSystemData.hpp>
-#include <ComponentLib/PowerElectronicsComponents/CircuitComponent.hpp>
+#include <ComponentLib/PowerElectronics/CircuitComponent.hpp>
 
 
 namespace ModelLib

diff --git a/...tronicsComponents/Inductor/CMakeLists.txt → .../PowerElectronics/Inductor/CMakeLists.txt b/...tronicsComponents/Inductor/CMakeLists.txt → .../PowerElectronics/Inductor/CMakeLists.txt
diff --git a/...ectronicsComponents/Inductor/Inductor.cpp → ...ib/PowerElectronics/Inductor/Inductor.cpp b/...ectronicsComponents/Inductor/Inductor.cpp → ...ib/PowerElectronics/Inductor/Inductor.cpp
diff --git a/...ectronicsComponents/Inductor/Inductor.hpp → ...ib/PowerElectronics/Inductor/Inductor.hpp b/...ectronicsComponents/Inductor/Inductor.hpp → ...ib/PowerElectronics/Inductor/Inductor.hpp
@@ -5,7 +5,7 @@
 
 #include <ModelEvaluatorImpl.hpp>
 #include <PowerSystemData.hpp>
-#include <ComponentLib/PowerElectronicsComponents/CircuitComponent.hpp>
+#include <ComponentLib/PowerElectronics/CircuitComponent.hpp>
 
 
 namespace ModelLib

diff --git a/...mponents/LinearTransformer/CMakeLists.txt → ...ctronics/LinearTransformer/CMakeLists.txt b/...mponents/LinearTransformer/CMakeLists.txt → ...ctronics/LinearTransformer/CMakeLists.txt
diff --git a/...s/LinearTransformer/LinearTransformer.cpp → ...s/LinearTransformer/LinearTransformer.cpp b/...s/LinearTransformer/LinearTransformer.cpp → ...s/LinearTransformer/LinearTransformer.cpp
diff --git a/...s/LinearTransformer/LinearTransformer.hpp → ...s/LinearTransformer/LinearTransformer.hpp b/...s/LinearTransformer/LinearTransformer.hpp → ...s/LinearTransformer/LinearTransformer.hpp
@@ -5,7 +5,7 @@
 
 #include <ModelEvaluatorImpl.hpp>
 #include <PowerSystemData.hpp>
-#include <ComponentLib/PowerElectronicsComponents/CircuitComponent.hpp>
+#include <ComponentLib/PowerElectronics/CircuitComponent.hpp>
 
 
 namespace ModelLib

diff --git a/...sComponents/MicrogridBusDQ/CMakeLists.txt → ...Electronics/MicrogridBusDQ/CMakeLists.txt b/...sComponents/MicrogridBusDQ/CMakeLists.txt → ...Electronics/MicrogridBusDQ/CMakeLists.txt
diff --git a/...ponents/MicrogridBusDQ/MicrogridBusDQ.cpp → ...tronics/MicrogridBusDQ/MicrogridBusDQ.cpp b/...ponents/MicrogridBusDQ/MicrogridBusDQ.cpp → ...tronics/MicrogridBusDQ/MicrogridBusDQ.cpp
diff --git a/...ponents/MicrogridBusDQ/MicrogridBusDQ.hpp → ...tronics/MicrogridBusDQ/MicrogridBusDQ.hpp b/...ponents/MicrogridBusDQ/MicrogridBusDQ.hpp → ...tronics/MicrogridBusDQ/MicrogridBusDQ.hpp
@@ -5,7 +5,7 @@
 
 #include <ModelEvaluatorImpl.hpp>
 #include <PowerSystemData.hpp>
-#include <ComponentLib/PowerElectronicsComponents/CircuitComponent.hpp>
+#include <ComponentLib/PowerElectronics/CircuitComponent.hpp>
 
 
 namespace ModelLib

diff --git a/...csComponents/MicrogridLine/CMakeLists.txt → ...rElectronics/MicrogridLine/CMakeLists.txt b/...csComponents/MicrogridLine/CMakeLists.txt → ...rElectronics/MicrogridLine/CMakeLists.txt
diff --git a/...omponents/MicrogridLine/MicrogridLine.cpp → ...ectronics/MicrogridLine/MicrogridLine.cpp b/...omponents/MicrogridLine/MicrogridLine.cpp → ...ectronics/MicrogridLine/MicrogridLine.cpp
diff --git a/...omponents/MicrogridLine/MicrogridLine.hpp → ...ectronics/MicrogridLine/MicrogridLine.hpp b/...omponents/MicrogridLine/MicrogridLine.hpp → ...ectronics/MicrogridLine/MicrogridLine.hpp
@@ -5,7 +5,7 @@
 
 #include <ModelEvaluatorImpl.hpp>
 #include <PowerSystemData.hpp>
-#include <ComponentLib/PowerElectronicsComponents/CircuitComponent.hpp>
+#include <ComponentLib/PowerElectronics/CircuitComponent.hpp>
 
 namespace ModelLib
 {

diff --git a/...csComponents/MicrogridLoad/CMakeLists.txt → ...rElectronics/MicrogridLoad/CMakeLists.txt b/...csComponents/MicrogridLoad/CMakeLists.txt → ...rElectronics/MicrogridLoad/CMakeLists.txt
diff --git a/...omponents/MicrogridLoad/MicrogridLoad.cpp → ...ectronics/MicrogridLoad/MicrogridLoad.cpp b/...omponents/MicrogridLoad/MicrogridLoad.cpp → ...ectronics/MicrogridLoad/MicrogridLoad.cpp
diff --git a/...omponents/MicrogridLoad/MicrogridLoad.hpp → ...ectronics/MicrogridLoad/MicrogridLoad.hpp b/...omponents/MicrogridLoad/MicrogridLoad.hpp → ...ectronics/MicrogridLoad/MicrogridLoad.hpp
@@ -5,7 +5,7 @@
 
 #include <ModelEvaluatorImpl.hpp>
 #include <PowerSystemData.hpp>
-#include <ComponentLib/PowerElectronicsComponents/CircuitComponent.hpp>
+#include <ComponentLib/PowerElectronics/CircuitComponent.hpp>
 
 
 namespace ModelLib

diff --git a/...tronicsComponents/Resistor/CMakeLists.txt → .../PowerElectronics/Resistor/CMakeLists.txt b/...tronicsComponents/Resistor/CMakeLists.txt → .../PowerElectronics/Resistor/CMakeLists.txt
diff --git a/...ectronicsComponents/Resistor/Resistor.cpp → ...ib/PowerElectronics/Resistor/Resistor.cpp b/...ectronicsComponents/Resistor/Resistor.cpp → ...ib/PowerElectronics/Resistor/Resistor.cpp
diff --git a/...ectronicsComponents/Resistor/Resistor.hpp → ...ib/PowerElectronics/Resistor/Resistor.hpp b/...ectronicsComponents/Resistor/Resistor.hpp → ...ib/PowerElectronics/Resistor/Resistor.hpp
@@ -5,7 +5,7 @@
 
 #include <ModelEvaluatorImpl.hpp>
 #include <PowerSystemData.hpp>
-#include <ComponentLib/PowerElectronicsComponents/CircuitComponent.hpp>
+#include <ComponentLib/PowerElectronics/CircuitComponent.hpp>
 
 
 namespace ModelLib

diff --git a/...ponents/SynchronousMachine/CMakeLists.txt → ...tronics/SynchronousMachine/CMakeLists.txt b/...ponents/SynchronousMachine/CMakeLists.txt → ...tronics/SynchronousMachine/CMakeLists.txt
diff --git a/...SynchronousMachine/SynchronousMachine.cpp → ...SynchronousMachine/SynchronousMachine.cpp b/...SynchronousMachine/SynchronousMachine.cpp → ...SynchronousMachine/SynchronousMachine.cpp
diff --git a/...SynchronousMachine/SynchronousMachine.hpp → ...SynchronousMachine/SynchronousMachine.hpp b/...SynchronousMachine/SynchronousMachine.hpp → ...SynchronousMachine/SynchronousMachine.hpp
@@ -5,7 +5,7 @@
 
 #include <ModelEvaluatorImpl.hpp>
 #include <PowerSystemData.hpp>
-#include <ComponentLib/PowerElectronicsComponents/CircuitComponent.hpp>
+#include <ComponentLib/PowerElectronics/CircuitComponent.hpp>
 #include <tuple>
 
 

diff --git a/...omponents/TransmissionLine/CMakeLists.txt → ...ectronics/TransmissionLine/CMakeLists.txt b/...omponents/TransmissionLine/CMakeLists.txt → ...ectronics/TransmissionLine/CMakeLists.txt
diff --git a/...nts/TransmissionLine/TransmissionLine.cpp → ...ics/TransmissionLine/TransmissionLine.cpp b/...nts/TransmissionLine/TransmissionLine.cpp → ...ics/TransmissionLine/TransmissionLine.cpp
diff --git a/...nts/TransmissionLine/TransmissionLine.hpp → ...ics/TransmissionLine/TransmissionLine.hpp b/...nts/TransmissionLine/TransmissionLine.hpp → ...ics/TransmissionLine/TransmissionLine.hpp
@@ -5,7 +5,7 @@
 
 #include <ModelEvaluatorImpl.hpp>
 #include <PowerSystemData.hpp>
-#include <ComponentLib/PowerElectronicsComponents/CircuitComponent.hpp>
+#include <ComponentLib/PowerElectronics/CircuitComponent.hpp>
 
 
 namespace ModelLib

diff --git a/...csComponents/VoltageSource/CMakeLists.txt → ...rElectronics/VoltageSource/CMakeLists.txt b/...csComponents/VoltageSource/CMakeLists.txt → ...rElectronics/VoltageSource/CMakeLists.txt
diff --git a/...omponents/VoltageSource/VoltageSource.cpp → ...ectronics/VoltageSource/VoltageSource.cpp b/...omponents/VoltageSource/VoltageSource.cpp → ...ectronics/VoltageSource/VoltageSource.cpp
diff --git a/...omponents/VoltageSource/VoltageSource.hpp → ...ectronics/VoltageSource/VoltageSource.hpp b/...omponents/VoltageSource/VoltageSource.hpp → ...ectronics/VoltageSource/VoltageSource.hpp
@@ -5,7 +5,7 @@
 
 #include <ModelEvaluatorImpl.hpp>
 #include <PowerSystemData.hpp>
-#include <ComponentLib/PowerElectronicsComponents/CircuitComponent.hpp>
+#include <ComponentLib/PowerElectronics/CircuitComponent.hpp>
 
 
 namespace ModelLib

diff --git a/ComponentLib/Branch/Branch.cpp → ComponentLib/PowerFlow/Branch/Branch.cpp b/ComponentLib/Branch/Branch.cpp → ComponentLib/PowerFlow/Branch/Branch.cpp
@@ -59,7 +59,7 @@
 
 #include <iostream>
 #include <cmath>
-#include <ComponentLib/Bus/BaseBus.hpp>
+#include <ComponentLib/PowerFlow/Bus/BaseBus.hpp>
 #include <PowerSystemData.hpp>
 
 #include "Branch.hpp"

diff --git a/ComponentLib/Branch/Branch.hpp → ComponentLib/PowerFlow/Branch/Branch.hpp b/ComponentLib/Branch/Branch.hpp → ComponentLib/PowerFlow/Branch/Branch.hpp
diff --git a/ComponentLib/Branch/CMakeLists.txt → ComponentLib/PowerFlow/Branch/CMakeLists.txt b/ComponentLib/Branch/CMakeLists.txt → ComponentLib/PowerFlow/Branch/CMakeLists.txt
diff --git a/ComponentLib/Branch/README.md → ComponentLib/PowerFlow/Branch/README.md b/ComponentLib/Branch/README.md → ComponentLib/PowerFlow/Branch/README.md
diff --git a/ComponentLib/Bus/BaseBus.hpp → ComponentLib/PowerFlow/Bus/BaseBus.hpp b/ComponentLib/Bus/BaseBus.hpp → ComponentLib/PowerFlow/Bus/BaseBus.hpp
diff --git a/ComponentLib/Bus/BusFactory.hpp → ComponentLib/PowerFlow/Bus/BusFactory.hpp b/ComponentLib/Bus/BusFactory.hpp → ComponentLib/PowerFlow/Bus/BusFactory.hpp
@@ -60,9 +60,9 @@
 #pragma once
 
 #include <PowerSystemData.hpp>
-#include <ComponentLib/Bus/BusPQ.hpp>
-#include <ComponentLib/Bus/BusPV.hpp>
-#include <ComponentLib/Bus/BusSlack.hpp>
+#include <ComponentLib/PowerFlow/Bus/BusPQ.hpp>
+#include <ComponentLib/PowerFlow/Bus/BusPV.hpp>
+#include <ComponentLib/PowerFlow/Bus/BusSlack.hpp>
 
 namespace ModelLib {
 

diff --git a/ComponentLib/Bus/BusPQ.cpp → ComponentLib/PowerFlow/Bus/BusPQ.cpp b/ComponentLib/Bus/BusPQ.cpp → ComponentLib/PowerFlow/Bus/BusPQ.cpp
diff --git a/ComponentLib/Bus/BusPQ.hpp → ComponentLib/PowerFlow/Bus/BusPQ.hpp b/ComponentLib/Bus/BusPQ.hpp → ComponentLib/PowerFlow/Bus/BusPQ.hpp
diff --git a/ComponentLib/Bus/BusPV.cpp → ComponentLib/PowerFlow/Bus/BusPV.cpp b/ComponentLib/Bus/BusPV.cpp → ComponentLib/PowerFlow/Bus/BusPV.cpp
diff --git a/ComponentLib/Bus/BusPV.hpp → ComponentLib/PowerFlow/Bus/BusPV.hpp b/ComponentLib/Bus/BusPV.hpp → ComponentLib/PowerFlow/Bus/BusPV.hpp
diff --git a/ComponentLib/Bus/BusSlack.cpp → ComponentLib/PowerFlow/Bus/BusSlack.cpp b/ComponentLib/Bus/BusSlack.cpp → ComponentLib/PowerFlow/Bus/BusSlack.cpp
diff --git a/ComponentLib/Bus/BusSlack.hpp → ComponentLib/PowerFlow/Bus/BusSlack.hpp b/ComponentLib/Bus/BusSlack.hpp → ComponentLib/PowerFlow/Bus/BusSlack.hpp
diff --git a/ComponentLib/Bus/CMakeLists.txt → ComponentLib/PowerFlow/Bus/CMakeLists.txt b/ComponentLib/Bus/CMakeLists.txt → ComponentLib/PowerFlow/Bus/CMakeLists.txt
diff --git a/ComponentLib/Bus/README.md → ComponentLib/PowerFlow/Bus/README.md b/ComponentLib/Bus/README.md → ComponentLib/PowerFlow/Bus/README.md
diff --git a/ComponentLib/PowerFlow/CMakeLists.txt b/ComponentLib/PowerFlow/CMakeLists.txt
@@ -0,0 +1,14 @@
+# [[
+#  Author(s):
+#    - Cameron Rutherford <cameron.rutherford@pnnl.gov>
+#]]
+
+add_subdirectory(Branch)
+add_subdirectory(Bus)
+add_subdirectory(Generator)
+add_subdirectory(Generator2)
+add_subdirectory(Generator4)
+add_subdirectory(Generator4Governor)
+add_subdirectory(Generator4Param)
+add_subdirectory(Load)
+add_subdirectory(MiniGrid)
diff --git a/ComponentLib/Generator/CMakeLists.txt → ...entLib/PowerFlow/Generator/CMakeLists.txt b/ComponentLib/Generator/CMakeLists.txt → ...entLib/PowerFlow/Generator/CMakeLists.txt
diff --git a/ComponentLib/Generator/GeneratorBase.hpp → ...Lib/PowerFlow/Generator/GeneratorBase.hpp b/ComponentLib/Generator/GeneratorBase.hpp → ...Lib/PowerFlow/Generator/GeneratorBase.hpp
diff --git a/ComponentLib/Generator/GeneratorFactory.hpp → .../PowerFlow/Generator/GeneratorFactory.hpp b/ComponentLib/Generator/GeneratorFactory.hpp → .../PowerFlow/Generator/GeneratorFactory.hpp
@@ -60,10 +60,10 @@
 #pragma once
 
 #include <PowerSystemData.hpp>
-#include <ComponentLib/Bus/BaseBus.hpp>
-#include <ComponentLib/Generator/GeneratorSlack.hpp>
-#include <ComponentLib/Generator/GeneratorPQ.hpp>
-#include <ComponentLib/Generator/GeneratorPV.hpp>
+#include <ComponentLib/PowerFlow/Bus/BaseBus.hpp>
+#include <ComponentLib/PowerFlow/Generator/GeneratorSlack.hpp>
+#include <ComponentLib/PowerFlow/Generator/GeneratorPQ.hpp>
+#include <ComponentLib/PowerFlow/Generator/GeneratorPV.hpp>
 
 
 namespace ModelLib {

diff --git a/ComponentLib/Generator/GeneratorPQ.cpp → ...ntLib/PowerFlow/Generator/GeneratorPQ.cpp b/ComponentLib/Generator/GeneratorPQ.cpp → ...ntLib/PowerFlow/Generator/GeneratorPQ.cpp
@@ -62,7 +62,7 @@
 #include <cmath>
 #include <vector>
 #include "GeneratorPQ.hpp"
-#include <ComponentLib/Bus/BaseBus.hpp>
+#include <ComponentLib/PowerFlow/Bus/BaseBus.hpp>
 
 namespace ModelLib {
 

diff --git a/ComponentLib/Generator/GeneratorPQ.hpp → ...ntLib/PowerFlow/Generator/GeneratorPQ.hpp b/ComponentLib/Generator/GeneratorPQ.hpp → ...ntLib/PowerFlow/Generator/GeneratorPQ.hpp
diff --git a/ComponentLib/Generator/GeneratorPV.cpp → ...ntLib/PowerFlow/Generator/GeneratorPV.cpp b/ComponentLib/Generator/GeneratorPV.cpp → ...ntLib/PowerFlow/Generator/GeneratorPV.cpp
@@ -62,7 +62,7 @@
 #include <cmath>
 #include <vector>
 #include "GeneratorPV.hpp"
-#include <ComponentLib/Bus/BaseBus.hpp>
+#include <ComponentLib/PowerFlow/Bus/BaseBus.hpp>
 
 namespace ModelLib {
 

diff --git a/ComponentLib/Generator/GeneratorPV.hpp → ...ntLib/PowerFlow/Generator/GeneratorPV.hpp b/ComponentLib/Generator/GeneratorPV.hpp → ...ntLib/PowerFlow/Generator/GeneratorPV.hpp
diff --git a/ComponentLib/Generator/GeneratorSlack.cpp → ...ib/PowerFlow/Generator/GeneratorSlack.cpp b/ComponentLib/Generator/GeneratorSlack.cpp → ...ib/PowerFlow/Generator/GeneratorSlack.cpp
@@ -62,7 +62,7 @@
 #include <cmath>
 #include <vector>
 #include "GeneratorSlack.hpp"
-#include <ComponentLib/Bus/BaseBus.hpp>
+#include <ComponentLib/PowerFlow/Bus/BaseBus.hpp>
 
 namespace ModelLib {
 

diff --git a/ComponentLib/Generator/GeneratorSlack.hpp → ...ib/PowerFlow/Generator/GeneratorSlack.hpp b/ComponentLib/Generator/GeneratorSlack.hpp → ...ib/PowerFlow/Generator/GeneratorSlack.hpp
diff --git a/ComponentLib/Generator2/CMakeLists.txt → ...ntLib/PowerFlow/Generator2/CMakeLists.txt b/ComponentLib/Generator2/CMakeLists.txt → ...ntLib/PowerFlow/Generator2/CMakeLists.txt
diff --git a/ComponentLib/Generator2/Generator2.cpp → ...ntLib/PowerFlow/Generator2/Generator2.cpp b/ComponentLib/Generator2/Generator2.cpp → ...ntLib/PowerFlow/Generator2/Generator2.cpp
@@ -59,7 +59,7 @@
 
 #include <iostream>
 #include <cmath>
-#include <ComponentLib/Bus/BusSlack.hpp>
+#include <ComponentLib/PowerFlow/Bus/BusSlack.hpp>
 #include "Generator2.hpp"
 
 namespace ModelLib {

diff --git a/ComponentLib/Generator2/Generator2.hpp → ...ntLib/PowerFlow/Generator2/Generator2.hpp b/ComponentLib/Generator2/Generator2.hpp → ...ntLib/PowerFlow/Generator2/Generator2.hpp
diff --git a/ComponentLib/Generator4/CMakeLists.txt → ...ntLib/PowerFlow/Generator4/CMakeLists.txt b/ComponentLib/Generator4/CMakeLists.txt → ...ntLib/PowerFlow/Generator4/CMakeLists.txt
diff --git a/ComponentLib/Generator4/Generator4.cpp → ...ntLib/PowerFlow/Generator4/Generator4.cpp b/ComponentLib/Generator4/Generator4.cpp → ...ntLib/PowerFlow/Generator4/Generator4.cpp
@@ -60,7 +60,7 @@
 
 #include <iostream>
 #include <cmath>
-#include <ComponentLib/Bus/BaseBus.hpp>
+#include <ComponentLib/PowerFlow/Bus/BaseBus.hpp>
 #include "Generator4.hpp"
 
 namespace ModelLib {

diff --git a/ComponentLib/Generator4/Generator4.hpp → ...ntLib/PowerFlow/Generator4/Generator4.hpp b/ComponentLib/Generator4/Generator4.hpp → ...ntLib/PowerFlow/Generator4/Generator4.hpp
diff --git a/...nentLib/Generator4Governor/CMakeLists.txt → ...werFlow/Generator4Governor/CMakeLists.txt b/...nentLib/Generator4Governor/CMakeLists.txt → ...werFlow/Generator4Governor/CMakeLists.txt
diff --git a/...Generator4Governor/Generator4Governor.cpp → ...Generator4Governor/Generator4Governor.cpp b/...Generator4Governor/Generator4Governor.cpp → ...Generator4Governor/Generator4Governor.cpp
@@ -61,7 +61,7 @@
 #include <iostream>
 #include <cmath>
 #include "Generator4Governor.hpp"
-#include "ComponentLib/Bus/BaseBus.hpp"
+#include "ComponentLib/PowerFlow/Bus/BaseBus.hpp"
 
 namespace ModelLib {
 

diff --git a/...Generator4Governor/Generator4Governor.hpp → ...Generator4Governor/Generator4Governor.hpp b/...Generator4Governor/Generator4Governor.hpp → ...Generator4Governor/Generator4Governor.hpp
diff --git a/ComponentLib/Generator4Param/CMakeLists.txt → .../PowerFlow/Generator4Param/CMakeLists.txt b/ComponentLib/Generator4Param/CMakeLists.txt → .../PowerFlow/Generator4Param/CMakeLists.txt
diff --git a/...ntLib/Generator4Param/Generator4Param.cpp → ...rFlow/Generator4Param/Generator4Param.cpp b/...ntLib/Generator4Param/Generator4Param.cpp → ...rFlow/Generator4Param/Generator4Param.cpp
@@ -60,7 +60,7 @@
 
 #include <iostream>
 #include <cmath>
-#include <ComponentLib/Bus/BaseBus.hpp>
+#include <ComponentLib/PowerFlow/Bus/BaseBus.hpp>
 #include "Generator4Param.hpp"
 
 namespace ModelLib {

diff --git a/...ntLib/Generator4Param/Generator4Param.hpp → ...rFlow/Generator4Param/Generator4Param.hpp b/...ntLib/Generator4Param/Generator4Param.hpp → ...rFlow/Generator4Param/Generator4Param.hpp
diff --git a/ComponentLib/Generator4Param/static_data.hpp → ...PowerFlow/Generator4Param/static_data.hpp b/ComponentLib/Generator4Param/static_data.hpp → ...PowerFlow/Generator4Param/static_data.hpp
diff --git a/ComponentLib/Load/CMakeLists.txt → ComponentLib/PowerFlow/Load/CMakeLists.txt b/ComponentLib/Load/CMakeLists.txt → ComponentLib/PowerFlow/Load/CMakeLists.txt
diff --git a/ComponentLib/Load/Load.cpp → ComponentLib/PowerFlow/Load/Load.cpp b/ComponentLib/Load/Load.cpp → ComponentLib/PowerFlow/Load/Load.cpp
@@ -62,7 +62,7 @@
 #include <cmath>
 #include <vector>
 #include "Load.hpp"
-#include <ComponentLib/Bus/BaseBus.hpp>
+#include <ComponentLib/PowerFlow/Bus/BaseBus.hpp>
 
 namespace ModelLib {
 

diff --git a/ComponentLib/Load/Load.hpp → ComponentLib/PowerFlow/Load/Load.hpp b/ComponentLib/Load/Load.hpp → ComponentLib/PowerFlow/Load/Load.hpp
diff --git a/ComponentLib/Load/README.md → ComponentLib/PowerFlow/Load/README.md b/ComponentLib/Load/README.md → ComponentLib/PowerFlow/Load/README.md
diff --git a/ComponentLib/MiniGrid/CMakeLists.txt → ...nentLib/PowerFlow/MiniGrid/CMakeLists.txt b/ComponentLib/MiniGrid/CMakeLists.txt → ...nentLib/PowerFlow/MiniGrid/CMakeLists.txt
diff --git a/ComponentLib/MiniGrid/MiniGrid.cpp → ComponentLib/PowerFlow/MiniGrid/MiniGrid.cpp b/ComponentLib/MiniGrid/MiniGrid.cpp → ComponentLib/PowerFlow/MiniGrid/MiniGrid.cpp
@@ -62,7 +62,7 @@
 #include <cmath>
 #include <vector>
 #include "MiniGrid.hpp"
-#include <ComponentLib/Bus/BaseBus.hpp>
+#include <ComponentLib/PowerFlow/Bus/BaseBus.hpp>
 
 namespace ModelLib {
 

diff --git a/ComponentLib/MiniGrid/MiniGrid.hpp → ComponentLib/PowerFlow/MiniGrid/MiniGrid.hpp b/ComponentLib/MiniGrid/MiniGrid.hpp → ComponentLib/PowerFlow/MiniGrid/MiniGrid.hpp
diff --git a/ComponentLib/README.md → ComponentLib/PowerFlow/README.md b/ComponentLib/README.md → ComponentLib/PowerFlow/README.md
@@ -1,6 +1,7 @@
 ## Component Models
 
 GridKit™ provides component models for power flow and electromechanical transient simulations, as well as experimental component models for dynamic constrained optimal power flow analysis. GridKit™ assembles components into a grid model using power flow equations. 
+
 ## Network Equations
 
 The relation between all the bus current injections and bus voltage is given by the following node equation: 

diff --git a/Examples/AdjointSensitivity/AdjointSensitivity.cpp b/Examples/AdjointSensitivity/AdjointSensitivity.cpp
@@ -61,8 +61,8 @@
 #include <iostream>
 #include <iomanip>
 
-#include <ComponentLib/Bus/BusSlack.hpp>
-#include <ComponentLib/Generator4/Generator4.hpp>
+#include <ComponentLib/PowerFlow/Bus/BusSlack.hpp>
+#include <ComponentLib/PowerFlow/Generator4/Generator4.hpp>
 #include <SystemModel.hpp>
 #include <Solver/Dynamic/Ida.hpp>
 #include <Utilities/Testing.hpp>

diff --git a/Examples/DistributedGeneratorTest/DGTest.cpp b/Examples/DistributedGeneratorTest/DGTest.cpp
@@ -7,7 +7,7 @@
 #include <filesystem>
 #include <math.h>
 
-#include <ComponentLib/PowerElectronicsComponents/DistributedGenerator/DistributedGenerator.hpp>
+#include <ComponentLib/PowerElectronics/DistributedGenerator/DistributedGenerator.hpp>
 
 
 /**

diff --git a/Examples/DynamicConstrainedOpt/DynamicConstrainedOpt.cpp b/Examples/DynamicConstrainedOpt/DynamicConstrainedOpt.cpp
@@ -61,8 +61,8 @@
 #include <iostream>
 #include <iomanip>
 
-#include <ComponentLib/Bus/BusSlack.hpp>
-#include <ComponentLib/Generator2/Generator2.hpp>
+#include <ComponentLib/PowerFlow/Bus/BusSlack.hpp>
+#include <ComponentLib/PowerFlow/Generator2/Generator2.hpp>
 #include <SystemModel.hpp>
 #include <Solver/Dynamic/Ida.hpp>
 

diff --git a/Examples/GenConstLoad/GenConstLoad.cpp b/Examples/GenConstLoad/GenConstLoad.cpp
@@ -61,9 +61,9 @@
 #include <iostream>
 #include <iomanip>
 
-#include <ComponentLib/Bus/BusPQ.hpp>
-#include <ComponentLib/Load/Load.hpp>
-#include <ComponentLib/Generator4Governor/Generator4Governor.hpp>
+#include <ComponentLib/PowerFlow/Bus/BusPQ.hpp>
+#include <ComponentLib/PowerFlow/Load/Load.hpp>
+#include <ComponentLib/PowerFlow/Generator4Governor/Generator4Governor.hpp>
 #include <Solver/Dynamic/Ida.hpp>
 #include <SystemModel.hpp>
 

diff --git a/Examples/GenInfiniteBus/GenInfiniteBus.cpp b/Examples/GenInfiniteBus/GenInfiniteBus.cpp
@@ -61,8 +61,8 @@
 #include <iostream>
 #include <iomanip>
 
-#include <ComponentLib/Bus/BusSlack.hpp>
-#include <ComponentLib/Generator4/Generator4.hpp>
+#include <ComponentLib/PowerFlow/Bus/BusSlack.hpp>
+#include <ComponentLib/PowerFlow/Generator4/Generator4.hpp>
 #include <SystemModel.hpp>
 #include <Solver/Dynamic/Ida.hpp>
 

diff --git a/Examples/Grid3Bus/Grid3BusSys.cpp b/Examples/Grid3Bus/Grid3BusSys.cpp
@@ -73,11 +73,11 @@
 #include <fstream>
 #include <filesystem>
 
-#include <ComponentLib/MiniGrid/MiniGrid.hpp>
-#include <ComponentLib/Bus/BusFactory.hpp>
-#include <ComponentLib/Generator/GeneratorFactory.hpp>
-#include <ComponentLib/Branch/Branch.hpp>
-#include <ComponentLib/Load/Load.hpp>
+#include <ComponentLib/PowerFlow/MiniGrid/MiniGrid.hpp>
+#include <ComponentLib/PowerFlow/Bus/BusFactory.hpp>
+#include <ComponentLib/PowerFlow/Generator/GeneratorFactory.hpp>
+#include <ComponentLib/PowerFlow/Branch/Branch.hpp>
+#include <ComponentLib/PowerFlow/Load/Load.hpp>
 #include <SystemSteadyStateModel.hpp>
 #include <Solver/SteadyState/Kinsol.hpp>
 #include <PowerSystemData.hpp>

diff --git a/Examples/Microgrid/Microgrid.cpp b/Examples/Microgrid/Microgrid.cpp
@@ -8,10 +8,10 @@
 #include <filesystem>
 
 
-#include <ComponentLib/PowerElectronicsComponents/DistributedGenerator/DistributedGenerator.hpp>
-#include <ComponentLib/PowerElectronicsComponents/MicrogridLine/MicrogridLine.hpp>
-#include <ComponentLib/PowerElectronicsComponents/MicrogridLoad/MicrogridLoad.hpp>
-#include <ComponentLib/PowerElectronicsComponents/MicrogridBusDQ/MicrogridBusDQ.hpp>
+#include <ComponentLib/PowerElectronics/DistributedGenerator/DistributedGenerator.hpp>
+#include <ComponentLib/PowerElectronics/MicrogridLine/MicrogridLine.hpp>
+#include <ComponentLib/PowerElectronics/MicrogridLoad/MicrogridLoad.hpp>
+#include <ComponentLib/PowerElectronics/MicrogridBusDQ/MicrogridBusDQ.hpp>
 
 #include <PowerElectronicsModel.hpp>
 #include <Solver/Dynamic/Ida.hpp>

diff --git a/Examples/ParameterEstimation/ParameterEstimation.cpp b/Examples/ParameterEstimation/ParameterEstimation.cpp
@@ -61,8 +61,8 @@
 #include <iostream>
 #include <iomanip>
 
-#include <ComponentLib/Bus/BusSlack.hpp>
-#include <ComponentLib/Generator4Param/Generator4Param.hpp>
+#include <ComponentLib/PowerFlow/Bus/BusSlack.hpp>
+#include <ComponentLib/PowerFlow/Generator4Param/Generator4Param.hpp>
 #include <SystemModel.hpp>
 #include <Solver/Dynamic/Ida.hpp>
 

diff --git a/Examples/RLCircuit/RLCircuit.cpp b/Examples/RLCircuit/RLCircuit.cpp
@@ -6,10 +6,10 @@
 #include <fstream>
 #include <filesystem>
 
-#include <ComponentLib/PowerElectronicsComponents/Capacitor/Capacitor.hpp>
-#include <ComponentLib/PowerElectronicsComponents/Inductor/Inductor.hpp>
-#include <ComponentLib/PowerElectronicsComponents/Resistor/Resistor.hpp>
-#include <ComponentLib/PowerElectronicsComponents/VoltageSource/VoltageSource.hpp>
+#include <ComponentLib/PowerElectronics/Capacitor/Capacitor.hpp>
+#include <ComponentLib/PowerElectronics/Inductor/Inductor.hpp>
+#include <ComponentLib/PowerElectronics/Resistor/Resistor.hpp>
+#include <ComponentLib/PowerElectronics/VoltageSource/VoltageSource.hpp>
 
 #include <PowerElectronicsModel.hpp>
 #include <Solver/Dynamic/Ida.hpp>

diff --git a/Examples/ScaleMicrogrid/ScaleMicrogrid.cpp b/Examples/ScaleMicrogrid/ScaleMicrogrid.cpp
@@ -8,10 +8,10 @@
 
 #include <Utilities/Testing.hpp>
 
-#include <ComponentLib/PowerElectronicsComponents/DistributedGenerator/DistributedGenerator.hpp>
-#include <ComponentLib/PowerElectronicsComponents/MicrogridLine/MicrogridLine.hpp>
-#include <ComponentLib/PowerElectronicsComponents/MicrogridLoad/MicrogridLoad.hpp>
-#include <ComponentLib/PowerElectronicsComponents/MicrogridBusDQ/MicrogridBusDQ.hpp>
+#include <ComponentLib/PowerElectronics/DistributedGenerator/DistributedGenerator.hpp>
+#include <ComponentLib/PowerElectronics/MicrogridLine/MicrogridLine.hpp>
+#include <ComponentLib/PowerElectronics/MicrogridLoad/MicrogridLoad.hpp>
+#include <ComponentLib/PowerElectronics/MicrogridBusDQ/MicrogridBusDQ.hpp>
 
 #include <PowerElectronicsModel.hpp>
 #include <Solver/Dynamic/Ida.hpp>