Restructure vagrant sections