Better vagrant layout