Aligning of Oil and Gas Law with Energy Law By : Sampe L. PurbaLaw No. 30 of 2007 (Energy Law) is a basis - both as the main upstream source and