Split water into its own layer
Finish highway refactoring