Change structure and add vagrant-exec support