vagrant: re-arrange file placement
install script update

-vagrant files updated
-prepare Makefile for manual install (need test)