move vms under infra

Fixes #126
Merge pull request #133 from dajohnso/vms_reorg

move vms under infra