Structure changes
Merge https://github.com/dmwilliamstech/puppet-gvm