TOKYO (Kyodo) -- Japan's government on Wednesday revealed a comprehensive plan to strengthen its energy supply structure, focusing on diversifying oil