Made the waterline engine files more consistent and abstract.