diff --git a/lib/veewee/command.rb b/lib/veewee/command.rb
index 6f135bac..7302be63 100644
--- a/lib/veewee/command.rb
+++ b/lib/veewee/command.rb
@@ -12,10 +12,11 @@
 tmp_dir=File.expand_path(File.join(veewee_dir, "tmp"))
 iso_dir=File.expand_path(File.join(veewee_dir, "iso"))
 box_dir=File.expand_path(File.join(veewee_dir, "boxes"))
+validation_dir=File.expand_path(File.join(veewee_dir, "validation"))
 
 #Initialize
 Veewee::Session.setenv({:veewee_dir => veewee_dir, :definition_dir => definition_dir,
-   :template_dir => template_dir, :iso_dir => iso_dir, :box_dir => box_dir, :tmp_dir => tmp_dir})
+   :template_dir => template_dir, :iso_dir => iso_dir, :box_dir => box_dir, :tmp_dir => tmp_dir, :validation_dir => validation_dir})
 
 module Veewee
 class Command < Vagrant::Command::GroupBase
diff --git a/lib/veewee/session.rb b/lib/veewee/session.rb
index c76a497c..e8236d30 100644
--- a/lib/veewee/session.rb
+++ b/lib/veewee/session.rb
@@ -22,7 +22,7 @@ def self.setenv(env)
       @veewee_dir=env[:veewee_dir]
       @definition_dir=env[:definition_dir]
       @template_dir=env[:template_dir]
-      @validation_dir=env[:veewee_dir] + 'validation'
+      @validation_dir=env[:validation_dir]
       @box_dir=env[:box_dir]
       @iso_dir=env[:iso_dir]
       @tmp_dir=env[:tmp_dir]
@@ -459,7 +459,7 @@ def self.destroy_vm(boxname)
     end
     
     def self.create_vm(boxname,force=false)
-
+      
       #Verifying the os.id with the :os_type_id specified
       matchfound=false
       VirtualBox::Global.global.lib.virtualbox.guest_os_types.collect { |os|
@@ -500,12 +500,6 @@ def self.create_vm(boxname,force=false)
         #Exec and system stop the execution here
         Veewee::Shell.execute("#{command}")
 
-      
-        #Set a shared folder for validation
-        if !File.exists?(@validation_dir)
-            FileUtils.mkdir(File.expand_path(@validation_dir))
-        end
-
         command="#{@vboxcmd} sharedfolder add  '#{boxname}' --name 'veewee-validation' --hostpath '#{File.expand_path(@validation_dir)}' --automount"
 
         Veewee::Shell.execute("#{command}")
diff --git a/lib/veewee/version.rb b/lib/veewee/version.rb
index 810f63d9..dd7ef814 100644
--- a/lib/veewee/version.rb
+++ b/lib/veewee/version.rb
@@ -1,3 +1,3 @@
 module Veewee
-  VERSION = "0.1.19"
+  VERSION = "0.1.20"
 end
diff --git a/templates/solaris-11-express-i386-experimental/auto_install/ai.dtd b/templates/solaris-11-express-i386/auto_install/ai.dtd
similarity index 100%
rename from templates/solaris-11-express-i386-experimental/auto_install/ai.dtd
rename to templates/solaris-11-express-i386/auto_install/ai.dtd
diff --git a/templates/solaris-11-express-i386-experimental/auto_install/ai_manifest.xml b/templates/solaris-11-express-i386/auto_install/ai_manifest.xml
similarity index 100%
rename from templates/solaris-11-express-i386-experimental/auto_install/ai_manifest.xml
rename to templates/solaris-11-express-i386/auto_install/ai_manifest.xml
diff --git a/templates/solaris-11-express-i386-experimental/auto_install/configuration.dtd b/templates/solaris-11-express-i386/auto_install/configuration.dtd
similarity index 100%
rename from templates/solaris-11-express-i386-experimental/auto_install/configuration.dtd
rename to templates/solaris-11-express-i386/auto_install/configuration.dtd
diff --git a/templates/solaris-11-express-i386-experimental/auto_install/default.xml b/templates/solaris-11-express-i386/auto_install/default.xml
similarity index 100%
rename from templates/solaris-11-express-i386-experimental/auto_install/default.xml
rename to templates/solaris-11-express-i386/auto_install/default.xml
diff --git a/templates/solaris-11-express-i386-experimental/auto_install/default.xml.orig b/templates/solaris-11-express-i386/auto_install/default.xml.orig
similarity index 100%
rename from templates/solaris-11-express-i386-experimental/auto_install/default.xml.orig
rename to templates/solaris-11-express-i386/auto_install/default.xml.orig
diff --git a/templates/solaris-11-express-i386-experimental/auto_install/sc_profiles/static_network.xml b/templates/solaris-11-express-i386/auto_install/sc_profiles/static_network.xml
similarity index 100%
rename from templates/solaris-11-express-i386-experimental/auto_install/sc_profiles/static_network.xml
rename to templates/solaris-11-express-i386/auto_install/sc_profiles/static_network.xml
diff --git a/templates/solaris-11-express-i386-experimental/auto_install/software.dtd b/templates/solaris-11-express-i386/auto_install/software.dtd
similarity index 100%
rename from templates/solaris-11-express-i386-experimental/auto_install/software.dtd
rename to templates/solaris-11-express-i386/auto_install/software.dtd
diff --git a/templates/solaris-11-express-i386-experimental/auto_install/target.dtd b/templates/solaris-11-express-i386/auto_install/target.dtd
similarity index 100%
rename from templates/solaris-11-express-i386-experimental/auto_install/target.dtd
rename to templates/solaris-11-express-i386/auto_install/target.dtd
diff --git a/templates/solaris-11-express-i386-experimental/default.xml b/templates/solaris-11-express-i386/default.xml
similarity index 100%
rename from templates/solaris-11-express-i386-experimental/default.xml
rename to templates/solaris-11-express-i386/default.xml
diff --git a/templates/solaris-11-express-i386-experimental/definition.rb b/templates/solaris-11-express-i386/definition.rb
similarity index 100%
rename from templates/solaris-11-express-i386-experimental/definition.rb
rename to templates/solaris-11-express-i386/definition.rb
diff --git a/templates/solaris-11-express-i386-experimental/postinstall.sh b/templates/solaris-11-express-i386/postinstall.sh
similarity index 93%
rename from templates/solaris-11-express-i386-experimental/postinstall.sh
rename to templates/solaris-11-express-i386/postinstall.sh
index 1f98a967..ae68e05f 100644
--- a/templates/solaris-11-express-i386-experimental/postinstall.sh
+++ b/templates/solaris-11-express-i386/postinstall.sh
@@ -64,6 +64,11 @@ cd /tmp
 /usr/bin/pkgtrans VirtualBox-4.0.6-SunOS-r71344.pkg . all
 yes|/usr/sbin/pkgadd -d . SUNWvbox
 
+# Fix the shells to include the /opt/csw directories
+
+echo "export PATH=/opt/csw/bin:/opt/csw/sbin/:$PATH" >> /root/.profile
+echo "export PATH=/opt/csw/bin:/opt/csw/sbin/:$PATH" >> /export/home/vagrant/.profile
+
 exit
 
 #Inspiration for ruby enterprise