Electricity ministry to end separate tender packages for power plants