added zsupporttools metapackage

and remove some deprecated stuff and better indentation