Move everything into a salt/ directory so I can bring pillars into the same repo
Add pillar data