diff --git a/IBPSA/Electrical/BaseClasses/PVSimple.mo b/IBPSA/Electrical/BaseClasses/PVSystems/PVSimple.mo
similarity index 87%
rename from IBPSA/Electrical/BaseClasses/PVSimple.mo
rename to IBPSA/Electrical/BaseClasses/PVSystems/PVSimple.mo
index 6c299d604d..e8d493a116 100644
--- a/IBPSA/Electrical/BaseClasses/PVSimple.mo
+++ b/IBPSA/Electrical/BaseClasses/PVSystems/PVSimple.mo
@@ -1,6 +1,5 @@
-within IBPSA.Electrical.BaseClasses;
-model PVSimple
-  "Simple PV model with internal or external MPP tracking"
+within IBPSA.Electrical.BaseClasses.PVSystems;
+model PVSimple "Simple PV model with internal or external MPP tracking"
 
   replaceable model ElectricalModel =
     IBPSA.Electrical.BaseClasses.BaseClasses.PartialPVElectrical
diff --git a/IBPSA/Electrical/BaseClasses/PVSystems/package.mo b/IBPSA/Electrical/BaseClasses/PVSystems/package.mo
new file mode 100644
index 0000000000..6edf6a0572
--- /dev/null
+++ b/IBPSA/Electrical/BaseClasses/PVSystems/package.mo
@@ -0,0 +1,3 @@
+within IBPSA.Electrical.BaseClasses;
+package PVSystems
+end PVSystems;
diff --git a/IBPSA/Electrical/BaseClasses/PVSystems/package.order b/IBPSA/Electrical/BaseClasses/PVSystems/package.order
new file mode 100644
index 0000000000..e5c3c8de65
--- /dev/null
+++ b/IBPSA/Electrical/BaseClasses/PVSystems/package.order
@@ -0,0 +1 @@
+PVSimple
diff --git a/IBPSA/Electrical/BaseClasses/package.order b/IBPSA/Electrical/BaseClasses/package.order
index 32e3a4a5bb..f802cf9ee7 100644
--- a/IBPSA/Electrical/BaseClasses/package.order
+++ b/IBPSA/Electrical/BaseClasses/package.order
@@ -1,2 +1,2 @@
-PVSimple
 BaseClasses
+PVSystems