diff --git a/IBPSA/Electrical/BaseClasses/BaseClasses/PartialPVElectrical.mo b/IBPSA/Electrical/BaseClasses/BaseClasses/PartialPVElectrical.mo
new file mode 100644
index 0000000000..71962bee09
--- /dev/null
+++ b/IBPSA/Electrical/BaseClasses/BaseClasses/PartialPVElectrical.mo
@@ -0,0 +1,6 @@
+within IBPSA.Electrical.BaseClasses.BaseClasses;
+partial model PartialPVElectrical
+  "Partial electrical model for PV module model"
+  annotation (Icon(coordinateSystem(preserveAspectRatio=false)), Diagram(
+        coordinateSystem(preserveAspectRatio=false)));
+end PartialPVElectrical;
diff --git a/IBPSA/Electrical/BaseClasses/BaseClasses/PartialPVOptical.mo b/IBPSA/Electrical/BaseClasses/BaseClasses/PartialPVOptical.mo
new file mode 100644
index 0000000000..53742250ea
--- /dev/null
+++ b/IBPSA/Electrical/BaseClasses/BaseClasses/PartialPVOptical.mo
@@ -0,0 +1,5 @@
+within IBPSA.Electrical.BaseClasses.BaseClasses;
+partial model PartialPVOptical
+  annotation (Icon(coordinateSystem(preserveAspectRatio=false)), Diagram(
+        coordinateSystem(preserveAspectRatio=false)));
+end PartialPVOptical;
diff --git a/IBPSA/Electrical/BaseClasses/BaseClasses/PartialPVThermal.mo b/IBPSA/Electrical/BaseClasses/BaseClasses/PartialPVThermal.mo
new file mode 100644
index 0000000000..bdc66a6d20
--- /dev/null
+++ b/IBPSA/Electrical/BaseClasses/BaseClasses/PartialPVThermal.mo
@@ -0,0 +1,5 @@
+within IBPSA.Electrical.BaseClasses.BaseClasses;
+partial model PartialPVThermal
+  annotation (Icon(coordinateSystem(preserveAspectRatio=false)), Diagram(
+        coordinateSystem(preserveAspectRatio=false)));
+end PartialPVThermal;
diff --git a/IBPSA/Electrical/BaseClasses/BaseClasses/package.mo b/IBPSA/Electrical/BaseClasses/BaseClasses/package.mo
new file mode 100644
index 0000000000..105e9d5773
--- /dev/null
+++ b/IBPSA/Electrical/BaseClasses/BaseClasses/package.mo
@@ -0,0 +1,5 @@
+within IBPSA.Electrical.BaseClasses;
+package BaseClasses "Base parameters for PV Model"
+  extends Modelica.Icons.BasesPackage;
+
+end BaseClasses;
diff --git a/IBPSA/Electrical/BaseClasses/BaseClasses/package.order b/IBPSA/Electrical/BaseClasses/BaseClasses/package.order
new file mode 100644
index 0000000000..9c6e2e85bf
--- /dev/null
+++ b/IBPSA/Electrical/BaseClasses/BaseClasses/package.order
@@ -0,0 +1,3 @@
+PartialPVElectrical
+PartialPVThermal
+PartialPVOptical
diff --git a/IBPSA/Electrical/BaseClasses/PVSimple.mo b/IBPSA/Electrical/BaseClasses/PVSimple.mo
new file mode 100644
index 0000000000..6c299d604d
--- /dev/null
+++ b/IBPSA/Electrical/BaseClasses/PVSimple.mo
@@ -0,0 +1,24 @@
+within IBPSA.Electrical.BaseClasses;
+model PVSimple
+  "Simple PV model with internal or external MPP tracking"
+
+  replaceable model ElectricalModel =
+    IBPSA.Electrical.BaseClasses.BaseClasses.PartialPVElectrical
+   "Model with electrical characteristics";
+
+  replaceable model ThermalModel =
+    IBPSA.Electrical.BaseClasses.BaseClasses.PartialPVThermal
+    "Model with thermal characteristics";
+
+  replaceable model OpticalModel =
+    IBPSA.Electrical.BaseClasses.BaseClasses.PartialPVOptical
+    "Model with optical characteristics"
+  annotation (Icon(coordinateSystem(preserveAspectRatio=false)), Diagram(
+        coordinateSystem(preserveAspectRatio=false)));
+
+  replaceable parameter IBPSA.Electrical.DataBase.PVSimpleBaseDataDefinition data
+   constrainedby AixLib.DataBase.SolarElectric.PVBaseDataDefinition
+   "PV Panel data definition"
+                             annotation (choicesAllMatching);
+
+end PVSimple;
diff --git a/IBPSA/Electrical/BaseClasses/package.mo b/IBPSA/Electrical/BaseClasses/package.mo
new file mode 100644
index 0000000000..e726d664dc
--- /dev/null
+++ b/IBPSA/Electrical/BaseClasses/package.mo
@@ -0,0 +1,5 @@
+within IBPSA.Electrical;
+package BaseClasses "Package with base classes for IBPSA.Electrical"
+  extends Modelica.Icons.BasesPackage;
+
+end BaseClasses;
diff --git a/IBPSA/Electrical/BaseClasses/package.order b/IBPSA/Electrical/BaseClasses/package.order
new file mode 100644
index 0000000000..32e3a4a5bb
--- /dev/null
+++ b/IBPSA/Electrical/BaseClasses/package.order
@@ -0,0 +1,2 @@
+PVSimple
+BaseClasses
diff --git a/IBPSA/Electrical/DataBase/PVSimpleBaseDataDefinition.mo b/IBPSA/Electrical/DataBase/PVSimpleBaseDataDefinition.mo
new file mode 100644
index 0000000000..46f30862e8
--- /dev/null
+++ b/IBPSA/Electrical/DataBase/PVSimpleBaseDataDefinition.mo
@@ -0,0 +1,6 @@
+within IBPSA.Electrical.DataBase;
+record PVSimpleBaseDataDefinition "Basic record of a PV Simple model"
+  extends Modelica.Icons.Record;
+  annotation (Icon(coordinateSystem(preserveAspectRatio=false)), Diagram(
+        coordinateSystem(preserveAspectRatio=false)));
+end PVSimpleBaseDataDefinition;
diff --git a/IBPSA/Electrical/DataBase/package.mo b/IBPSA/Electrical/DataBase/package.mo
new file mode 100644
index 0000000000..e6e62177e6
--- /dev/null
+++ b/IBPSA/Electrical/DataBase/package.mo
@@ -0,0 +1,3 @@
+within IBPSA.Electrical;
+package DataBase "Data base for electrical package"
+end DataBase;
diff --git a/IBPSA/Electrical/DataBase/package.order b/IBPSA/Electrical/DataBase/package.order
new file mode 100644
index 0000000000..52259a5b98
--- /dev/null
+++ b/IBPSA/Electrical/DataBase/package.order
@@ -0,0 +1 @@
+PVSimpleBaseDataDefinition
diff --git a/IBPSA/Electrical/package.mo b/IBPSA/Electrical/package.mo
new file mode 100644
index 0000000000..3b153dc860
--- /dev/null
+++ b/IBPSA/Electrical/package.mo
@@ -0,0 +1,8 @@
+within IBPSA;
+package Electrical "Package with models for electrical systems and components"
+  extends Modelica.Icons.Package;
+
+annotation (Icon(graphics={Line(points={{6,82},{-60,0},{12,0},{-24,-62},{-36,
+            -56},{-28,-90},{2,-76},{-8,-70},{52,20},{52,20},{-14,20},{40,82},{6,
+            82}}, color={0,0,0})}));
+end Electrical;
diff --git a/IBPSA/Electrical/package.order b/IBPSA/Electrical/package.order
new file mode 100644
index 0000000000..d747593b80
--- /dev/null
+++ b/IBPSA/Electrical/package.order
@@ -0,0 +1,2 @@
+DataBase
+BaseClasses