Improve packaging
test
Start writing water page