move vms under infra

Fixes #126