Consolidate and tidy up a bit.

Make things all a single array
Standardize on strings for Zips
Yaml Lint over and over again.