diff --git a/Vagrantfile b/Vagrantfile
index f68d4ed..f0bfdda 100644
--- a/Vagrantfile
+++ b/Vagrantfile
@@ -1,7 +1,7 @@
 # -*- mode: ruby -*-
 # vi: set ft=ruby :
 
-# Salt lab environment with one master and four minions
+# Salt lab environment with one master and various minions
 
 Vagrant.configure("2") do |config|
   config.nfs.verify_installed = false
@@ -13,7 +13,7 @@ Vagrant.configure("2") do |config|
     salt.vm.provider :libvirt do |libvirt|
       libvirt.memory = 1024
     end
-    # salt.vm.synced_folder 'srv', '/srv', type: 'rsync'
+    salt.vm.synced_folder 'salt_content/local', '/srv', type: 'rsync'
     salt.vm.provision "shell", inline: <<-SHELL
       apt-get update
       apt-get install curl vim python3-pygit2 -y
@@ -23,7 +23,7 @@ Vagrant.configure("2") do |config|
 auto_accept: True
 file_roots:
   base:
-    - /srv/
+    - /srv/salt
 fileserver_backend:
   - roots
   - gitfs
@@ -32,12 +32,15 @@ gitfs_update_interval: 60
 gitfs_base: main
 gitfs_remotes:
   - https://github.com/jbowdre/vagrant-saltlab.git:
-    - root: salt_content/salt
+    - root: salt_content/gitfs/salt
     - mountpoint: salt://
+pillar_roots:
+    base:
+      - /srv/pillar
 ext_pillar:
   - git:
     - main https://github.com/jbowdre/vagrant-saltlab.git:
-      - root: salt_content/pillar
+      - root: salt_content/gitfs/pillar
       - env: base
 reactor:
   - 'salt/minion/*/start':
diff --git a/salt_content/pillar/pkg/init.sls b/salt_content/gitfs/pillar/pkg/init.sls
similarity index 100%
rename from salt_content/pillar/pkg/init.sls
rename to salt_content/gitfs/pillar/pkg/init.sls
diff --git a/salt_content/pillar/top.sls b/salt_content/gitfs/pillar/top.sls
similarity index 100%
rename from salt_content/pillar/top.sls
rename to salt_content/gitfs/pillar/top.sls
diff --git a/salt_content/pillar/users/init.sls b/salt_content/gitfs/pillar/users/init.sls
similarity index 100%
rename from salt_content/pillar/users/init.sls
rename to salt_content/gitfs/pillar/users/init.sls
diff --git a/salt_content/salt/_reactor/sync_grains.sls b/salt_content/gitfs/salt/_reactor/sync_grains.sls
similarity index 100%
rename from salt_content/salt/_reactor/sync_grains.sls
rename to salt_content/gitfs/salt/_reactor/sync_grains.sls
diff --git a/salt_content/salt/top.sls b/salt_content/gitfs/salt/top.sls
similarity index 100%
rename from salt_content/salt/top.sls
rename to salt_content/gitfs/salt/top.sls
diff --git a/salt_content/salt/users/init.sls b/salt_content/gitfs/salt/users/init.sls
similarity index 100%
rename from salt_content/salt/users/init.sls
rename to salt_content/gitfs/salt/users/init.sls
diff --git a/salt_content/salt/vim/init.sls b/salt_content/gitfs/salt/vim/init.sls
similarity index 100%
rename from salt_content/salt/vim/init.sls
rename to salt_content/gitfs/salt/vim/init.sls
diff --git a/salt_content/salt/vim/uninstall.sls b/salt_content/gitfs/salt/vim/uninstall.sls
similarity index 100%
rename from salt_content/salt/vim/uninstall.sls
rename to salt_content/gitfs/salt/vim/uninstall.sls
diff --git a/salt_content/salt/vim/vimrc b/salt_content/gitfs/salt/vim/vimrc
similarity index 100%
rename from salt_content/salt/vim/vimrc
rename to salt_content/gitfs/salt/vim/vimrc
diff --git a/salt_content/salt/webserver/index.html b/salt_content/gitfs/salt/webserver/index.html
similarity index 100%
rename from salt_content/salt/webserver/index.html
rename to salt_content/gitfs/salt/webserver/index.html
diff --git a/salt_content/salt/webserver/init.sls b/salt_content/gitfs/salt/webserver/init.sls
similarity index 100%
rename from salt_content/salt/webserver/init.sls
rename to salt_content/gitfs/salt/webserver/init.sls
diff --git a/salt_content/salt/webserver/uninstall.sls b/salt_content/gitfs/salt/webserver/uninstall.sls
similarity index 100%
rename from salt_content/salt/webserver/uninstall.sls
rename to salt_content/gitfs/salt/webserver/uninstall.sls
diff --git a/salt_content/local/pillar/.gitkeep b/salt_content/local/pillar/.gitkeep
new file mode 100644
index 0000000..e69de29
diff --git a/salt_content/local/reactor/.gitkeep b/salt_content/local/reactor/.gitkeep
new file mode 100644
index 0000000..e69de29
diff --git a/salt_content/local/salt/.gitkeep b/salt_content/local/salt/.gitkeep
new file mode 100644
index 0000000..e69de29