diff --git a/README.md b/README.md
index 17b8e13..77fa3d6 100644
--- a/README.md
+++ b/README.md
@@ -36,7 +36,7 @@ Clone or copy the repo and do the following:
 
 ## Choosing golang version
 
-This repo is hardcoded to use 1.5.3 although this can easily be changed after
+This repo is hardcoded to use 1.6 although this can easily be changed after
 cloning. If you want to use another version simply set the `$version` parameter
 when calling the class. The version string is taken from the
 [golang downloads list](http://golang.org/dl/). Once changed you can either call
diff --git a/Vagrantfile b/Vagrantfile
index 5a554d4..1c98842 100644
--- a/Vagrantfile
+++ b/Vagrantfile
@@ -2,11 +2,9 @@
 # vi: set ft=ruby :
 
 Vagrant::Config.run do |config|
-  config.vm.box = "debian-607-x64-vbox4210"
-  config.vm.box_url = "http://puppet-vagrant-boxes.puppetlabs.com/debian-607-x64-vbox4210.box"
+  config.vm.box = "puphpet/debian75-x64"
   config.vm.provision :puppet do |puppet|
-    puppet.module_path      = "modules"
-    puppet.manifests_path  = "manifests"
-    puppet.manifest_file      = "init.pp"
+    puppet.environment      = "development"
+    puppet.environment_path = "environments"
   end
 end
diff --git a/manifests/init.pp b/environments/development/manifests/init.pp
similarity index 100%
rename from manifests/init.pp
rename to environments/development/manifests/init.pp
diff --git a/modules/golang/manifests/init.pp b/environments/development/modules/golang/manifests/init.pp
similarity index 97%
rename from modules/golang/manifests/init.pp
rename to environments/development/modules/golang/manifests/init.pp
index 0761149..c2a6fef 100644
--- a/modules/golang/manifests/init.pp
+++ b/environments/development/modules/golang/manifests/init.pp
@@ -1,4 +1,4 @@
-class golang ( $version = "1.5.3" ) {
+class golang ( $version = "1.6" ) {
 
   exec { "download-golang":
     command => "/usr/bin/wget --no-check-certificate -O /usr/local/src/go$version.linux-amd64.tar.gz http://golang.org/dl/go$version.linux-amd64.tar.gz",