diff --git a/deploy/kube-up.sh b/deploy/kube-up.sh
index 7da3ab7..671081d 100755
--- a/deploy/kube-up.sh
+++ b/deploy/kube-up.sh
@@ -1,4 +1,5 @@
 #! /bin/bash
 
+pushd utils/vagrant
 vagrant up
 vagrant ssh solar -c /vagrant/deploy/deploy.sh
diff --git a/Vagrantfile b/utils/vagrant/Vagrantfile
similarity index 96%
rename from Vagrantfile
rename to utils/vagrant/Vagrantfile
index 9f3f411..125e302 100644
--- a/Vagrantfile
+++ b/utils/vagrant/Vagrantfile
@@ -50,6 +50,10 @@ def shell_script(filename, env=[], args=[])
   "/bin/bash -c \"#{env.join ' '} #{filename} #{args.join ' '} \""
 end
 
+if not SYNC_TYPE
+  SYNC_TYPE = "rsync"
+end
+
 Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
 
   config.vm.define "solar", primary: true do |config|
@@ -85,10 +89,10 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
     end
 
     if SYNC_TYPE == 'nfs'
-      config.vm.synced_folder ".", "/vagrant", type: "nfs"
+      config.vm.synced_folder "../../", "/vagrant", type: "nfs"
     end
     if SYNC_TYPE == 'rsync'
-      config.vm.synced_folder ".", "/vagrant", type: "rsync",
+      config.vm.synced_folder "../../", "/vagrant", type: "rsync",
         rsync__args: ["--verbose", "--archive", "--delete", "-z"]
     end
 
diff --git a/vagrant-settings.yaml_defaults b/utils/vagrant/vagrant-settings.yaml_defaults
similarity index 100%
rename from vagrant-settings.yaml_defaults
rename to utils/vagrant/vagrant-settings.yaml_defaults