diff --git a/manifests/enable_vo.pp b/manifests/enable_vo.pp
index 318870a..69d1d97 100644
--- a/manifests/enable_vo.pp
+++ b/manifests/enable_vo.pp
@@ -24,19 +24,19 @@
          'prod.vo.eu-eela.eu' => 'eela',
          'vo.delphi.cern.ch' => 'delphi', 
          'vo.aleph.cern.ch' => 'aleph',
-        default => $voname
+         default => regsubst($voname,'[\-\.]','_','G') #strip impossible puppet module name chars
       }
       include "voms::${voms_module_name}"      
     }
     
     if ($enable_poolaccounts) {
       include vosupport::vo_poolaccounts      
-      Setuphome <| voname == $voname |>
+      Vosupport::Setuphome <| voname == $voname |>
     }
     
     if ($enable_environment) {
       include vosupport::vo_environment
-      Voenv  <| voname == $voname |>
+      Vosupport::Voenv  <| voname == $voname |>
     }
     
     if $enable_mappings_for_service != undef {
@@ -76,17 +76,17 @@
     
     if $enable_gridmapdir {
       include vosupport::vo_gridmapdir
-      Setupgridmapdir <| voname == $voname |>
+      Vosupport::Setupgridmapdir <| voname == $voname |>
     }
     
     if $enable_sudoers {
       include vosupport::vo_sudoers
-      Setupsudoers <| voname == $voname |>
+      Vosupport::Setupsudoers <| voname == $voname |>
     }
     
     if $enable_sandboxdir {
       include vosupport::vo_sandboxdir
-      Setupsandbox  <| voname == $voname |>
+      Vosupport::Setupsandbox  <| voname == $voname |>
     }
 }
 
diff --git a/manifests/init.pp b/manifests/init.pp
index 85471ef..684d639 100644
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -8,31 +8,29 @@
   $enable_gridmapdir_for_group = hiera("vosupport_enable_gridmapdir_for_group",undef), #if specified, create and populate gridmapdir with pool accounts and sets the ownership of the gridmapdir to the specified group name
   $enable_sudoers = hiera("vosupport_enable_sudoers",false), # if specified, create and populate /etc/
   $enable_sandboxdir = hiera("vosupport_enable_sandboxdir",false), # if specified, create and populate /etc/
-)  
+)
 {
 
-  include concat::setup
-
   file {"grid-env-funcs.sh":
     path => '/usr/libexec/grid-env-funcs.sh',
     source => 'puppet:///modules/vosupport/grid-env-funcs.sh',
     owner => "root",
     group => "root",
-    mode => 0644,
+    mode => '0644',
   }
   file {"clean-grid-env-funcs.sh":
     path => '/usr/libexec/clean-grid-env-funcs.sh',
     source => 'puppet:///modules/vosupport/clean-grid-env-funcs.sh',
     owner => "root",
     group => "root",
-    mode => 0644,
+    mode => '0644',
   }
-  
+
   #create gridmapdir if necessary
   if $enable_gridmapdir_for_group != undef {
     file {'/etc/grid-security/gridmapdir':
       ensure => directory,
-      mode => 0770,
+      mode => '0770',
       owner => root,
       group => $enable_gridmapdir_for_group,
       require => File['/etc/grid-security']
@@ -40,7 +38,7 @@
   }
 
   #
-  # overall process: 
+  # overall process:
   #
 
   #get metadata from hiera
@@ -55,8 +53,8 @@
   #enable the list of supported VOs from the class parameters (most likely coming from hiera)
   #for create_resources to be happy we need to convert the  $supported_vos array into a hash
   #i.e. yaml that looks like "{ vo1: {}, vo2: {}, etc. }"
-  $supported_vos_hash=parseyaml(inline_template("{ <%= @supported_vos.collect{ |voname| voname + ': {}' }.join(', ') %>} "))     
-  
+  $supported_vos_hash=parseyaml(inline_template("{ <%= @supported_vos.collect{ |voname| voname + ': {}' }.join(', ') %>} "))
+
   $supported_vos_params={
     enable_poolaccounts => $enable_poolaccounts,
     enable_mappings_for_service => $enable_mappings_for_service,
diff --git a/manifests/setupsandbox.pp b/manifests/setupsandbox.pp
index b788734..ba29eff 100644
--- a/manifests/setupsandbox.pp
+++ b/manifests/setupsandbox.pp
@@ -9,7 +9,7 @@
       ensure => 'directory',
       owner => 'tomcat',
       group => $group,
-      mode => 0770,
+      mode => '0770',
     }  
   }
 }
diff --git a/manifests/setupsudoers.pp b/manifests/setupsudoers.pp
index fb384c8..787dfc6 100644
--- a/manifests/setupsudoers.pp
+++ b/manifests/setupsudoers.pp
@@ -12,7 +12,7 @@
     ensure => present,
     owner => "root",
     group => "root",
-    mode => 0640,
+    mode => '0640',
   }  
 }
 
diff --git a/manifests/vo_environment.pp b/manifests/vo_environment.pp
index 803edf7..dc433b0 100644
--- a/manifests/vo_environment.pp
+++ b/manifests/vo_environment.pp
@@ -1,23 +1,23 @@
 #initialize VO environment virtual resources
 class vosupport::vo_environment()
 {
-  
+
   $gridenvfile = '/etc/profile.d/grid-vo-env.sh'
-  
+
   concat{$gridenvfile:
     owner =>  'root',
     group =>  'root',
     mode  =>  '0755',
-    warn => "# $gridenvfile is managed by Puppet env.pp.\n#Any changes in here will be overwritten",         
+    warn => "# $gridenvfile is managed by Puppet env.pp.\n#Any changes in here will be overwritten\n",
   }
-  
-  concat::fragment{'grid-vo-env header': 
+
+  concat::fragment{'grid-vo-env header':
     target  => $gridenvfile,
     order   => '01',
     content => template('vosupport/gridenvsh_header.erb')
   }
-  
-  concat::fragment{'grid-vo-env footer': 
+
+  concat::fragment{'grid-vo-env footer':
     target  => $gridenvfile,
     order   => '99',
     content => template('vosupport/gridenvsh_footer.erb')
@@ -30,11 +30,11 @@
     ensure => present,
     owner => "root",
     group => "root",
-    mode => 0755,
+    mode => '0755',
     content => template("vosupport/grid-vo-env.csh.erb"),
   }
 
-  
+
   $voenvdefaults = hiera_hash('vosupport::voenv',undef)
   create_resources('vosupport::virtual_voenv',$voenvdefaults)
 }
diff --git a/manifests/vo_lcgdm_mappings.pp b/manifests/vo_lcgdm_mappings.pp
index 2f2efb7..777ecc2 100644
--- a/manifests/vo_lcgdm_mappings.pp
+++ b/manifests/vo_lcgdm_mappings.pp
@@ -22,12 +22,12 @@
       ensure => present,
       owner  => root,
       group  => root,
-      mode   => 644;
+      mode   => '0644';
      "$localmapfile":
       ensure => present,
       owner  => root,
       group  => root,
-      mode   => 644
+      mode   => '0644'
    }
 
    # for edg-mkgridmap   
diff --git a/manifests/vo_poolaccounts.pp b/manifests/vo_poolaccounts.pp
index e15bdac..6146277 100644
--- a/manifests/vo_poolaccounts.pp
+++ b/manifests/vo_poolaccounts.pp
@@ -14,7 +14,7 @@
       ensure => directory,
       owner   => root,
       group   => root,
-      mode    => 0755,
+      mode    => '0755',
   }
   
   file {
@@ -23,7 +23,7 @@
       ensure => directory,
       owner   => root,
       group   => root,
-      mode    => 0755,
+      mode    => '0755',
   }
   
   file {"/home/grid":
diff --git a/manifests/vo_sandboxdir.pp b/manifests/vo_sandboxdir.pp
index b38fcda..2591f8e 100644
--- a/manifests/vo_sandboxdir.pp
+++ b/manifests/vo_sandboxdir.pp
@@ -5,7 +5,7 @@
       ensure => 'directory',
       owner => 'tomcat',
       group => 'tomcat',
-      mode => 0775
+      mode => '0775'
     }
   }
   #
diff --git a/metadata.json b/metadata.json
new file mode 100644
index 0000000..48f7958
--- /dev/null
+++ b/metadata.json
@@ -0,0 +1,18 @@
+{
+  "author": "schwicke",
+  "dependencies": [
+    {
+      "name": "puppetlabs/stdlib"
+    }
+  ],
+  "description": "This modules provides classes and definitions required to setup a list of supported VOs.",
+  "license": "Apache License, Version 2.0 (the \"License\")",
+  "name": "CERNOps-vosupport",
+  "operatingsystem_support": [],
+  "project_page": "http://www.eu-emi.eu/",
+  "requirements": [],
+  "source": "",
+  "summary": "VO default definitions and setup tools",
+  "tags": [],
+  "version": "0.0.1"
+}
\ No newline at end of file
diff --git a/templates/gridenv-vo.sh.erb b/templates/gridenv-vo.sh.erb
index a553bb2..002e901 100644
--- a/templates/gridenv-vo.sh.erb
+++ b/templates/gridenv-vo.sh.erb
@@ -1,4 +1,4 @@
 
-    # specific settings for <%=voname%>
-    gridenv_set         "VO_<%=voname.upcase.gsub('.','_')%>_SW_DIR" "<%=vo_sw_dir%>"
-    gridenv_set         "VO_<%=voname.upcase.gsub('.','_')%>_DEFAULT_SE" "<%=vo_default_se%>"
+    # specific settings for <%=@voname%>
+    gridenv_set         "VO_<%=@voname.upcase.gsub('.','_')%>_SW_DIR" "<%=@vo_sw_dir%>"
+    gridenv_set         "VO_<%=@voname.upcase.gsub('.','_')%>_DEFAULT_SE" "<%=@vo_default_se%>"