Non-Hydrostatic Modelling of Waves in Layered Fluids