diff --git a/VectoCore/VectoCore/Models/SimulationComponent/Data/Battery/BatteryData.cs b/VectoCore/VectoCore/Models/SimulationComponent/Data/ElectricComponents/Battery/BatteryData.cs
similarity index 100%
rename from VectoCore/VectoCore/Models/SimulationComponent/Data/Battery/BatteryData.cs
rename to VectoCore/VectoCore/Models/SimulationComponent/Data/ElectricComponents/Battery/BatteryData.cs
diff --git a/VectoCore/VectoCore/Models/SimulationComponent/Data/ElectricMotor/DragCurve.cs b/VectoCore/VectoCore/Models/SimulationComponent/Data/ElectricComponents/ElectricMotor/DragCurve.cs
similarity index 100%
rename from VectoCore/VectoCore/Models/SimulationComponent/Data/ElectricMotor/DragCurve.cs
rename to VectoCore/VectoCore/Models/SimulationComponent/Data/ElectricComponents/ElectricMotor/DragCurve.cs
diff --git a/VectoCore/VectoCore/Models/SimulationComponent/Data/ElectricMotor/EfficiencyMap.cs b/VectoCore/VectoCore/Models/SimulationComponent/Data/ElectricComponents/ElectricMotor/EfficiencyMap.cs
similarity index 100%
rename from VectoCore/VectoCore/Models/SimulationComponent/Data/ElectricMotor/EfficiencyMap.cs
rename to VectoCore/VectoCore/Models/SimulationComponent/Data/ElectricComponents/ElectricMotor/EfficiencyMap.cs
diff --git a/VectoCore/VectoCore/Models/SimulationComponent/Data/ElectricMotor/ElectricMotorData.cs b/VectoCore/VectoCore/Models/SimulationComponent/Data/ElectricComponents/ElectricMotor/ElectricMotorData.cs
similarity index 100%
rename from VectoCore/VectoCore/Models/SimulationComponent/Data/ElectricMotor/ElectricMotorData.cs
rename to VectoCore/VectoCore/Models/SimulationComponent/Data/ElectricComponents/ElectricMotor/ElectricMotorData.cs
diff --git a/VectoCore/VectoCore/Models/SimulationComponent/Data/ElectricMotor/ElectricMotorFullLoadCurve.cs b/VectoCore/VectoCore/Models/SimulationComponent/Data/ElectricComponents/ElectricMotor/ElectricMotorFullLoadCurve.cs
similarity index 100%
rename from VectoCore/VectoCore/Models/SimulationComponent/Data/ElectricMotor/ElectricMotorFullLoadCurve.cs
rename to VectoCore/VectoCore/Models/SimulationComponent/Data/ElectricComponents/ElectricMotor/ElectricMotorFullLoadCurve.cs