Cleaned up and reorganized height field water classes