NITI Aayog to work with Himachal Pradesh and Jammu and Kashmir to rewrite state laws