Infrastructure, Resource Adequacy and Electricity Market Restructuring