Energy and EnergySet files added