Improve Vagrant setup to use proper directories

Make it a lot cleaner to setup