The Evolution of the Energy Market