Re-organized modules and manifests
Merge branch 'reorg' of github.com:evilensky/avalon-vagrant