Intermediate commit with improved package configuration.

After all, we will need some more testing, to finally implement proper tank
testing with everything you would expect, to the extend possible.