Revised structures of cymbopogone and cymbopogonol