Move water, lava, and ice to Core

This leaves just air in the engine