Improve packaging
Start writing water page