update to new package structure
Merge branch 'master' of github.com:vmware-serengeti/vhm
Merge branch 'master' of github.com:vmware-serengeti/vhm