Add water and refactor world format.