diff --git a/Rakefile b/Rakefile
index a233c35e75e07cd8af2c60e8e63e36986a612ff1..410b242053e7dad43c35f0cc9c0f3f0ef702a2ab 100644
--- a/Rakefile
+++ b/Rakefile
@@ -17,22 +17,6 @@ VALIDATORS_DIR = "./generators/input-validators"
 
 G5K_SITES = RefRepo::Utils::get_sites
 
-namespace :puppet do
-
-  all_puppet_tasks = [:bindg5k, :conmang5k, :dhcpg5k, :kadeployg5k, :lanpowerg5k, :kavlang5k]
-
-  all_puppet_tasks.each { |t|
-    desc "Generate #{t} configuration"
-    task t do
-      invoke_script "#{PUPPET_DIR}/#{t}.rb"
-    end
-  }
-
-  desc "Launch all puppet generators"
-  task :all => all_puppet_tasks
-
-end
-
 namespace :valid do
 
   desc "Check homogeneity of clusters -- parameters: SITE={grenoble,..} CLUSTER={yeti,..} VERBOSE=1"
@@ -167,6 +151,23 @@ namespace :gen do
     exit(ret)
   end
 
+namespace :puppet do
+
+  all_puppet_tasks = [:bindg5k, :conmang5k, :dhcpg5k, :kadeployg5k, :lanpowerg5k, :kavlang5k]
+
+  all_puppet_tasks.each { |t|
+    desc "Generate #{t} configuration"
+    task t do
+      invoke_script "#{PUPPET_DIR}/#{t}.rb"
+    end
+  }
+
+  desc "Launch all puppet generators"
+  task :all => all_puppet_tasks
+
+end
+
+
 end
 
 desc "Creates JSON data from inputs"
diff --git a/generators/puppet/bindg5k.rb b/lib/refrepo/gen/puppet/bindg5k.rb
similarity index 100%
rename from generators/puppet/bindg5k.rb
rename to lib/refrepo/gen/puppet/bindg5k.rb
diff --git a/generators/puppet/conf-examples/console-password.yaml b/lib/refrepo/gen/puppet/conf-examples/console-password.yaml
similarity index 100%
rename from generators/puppet/conf-examples/console-password.yaml
rename to lib/refrepo/gen/puppet/conf-examples/console-password.yaml
diff --git a/generators/puppet/conf-examples/console.yaml b/lib/refrepo/gen/puppet/conf-examples/console.yaml
similarity index 100%
rename from generators/puppet/conf-examples/console.yaml
rename to lib/refrepo/gen/puppet/conf-examples/console.yaml
diff --git a/generators/puppet/conf-examples/kadeployg5k-dev.yaml b/lib/refrepo/gen/puppet/conf-examples/kadeployg5k-dev.yaml
similarity index 100%
rename from generators/puppet/conf-examples/kadeployg5k-dev.yaml
rename to lib/refrepo/gen/puppet/conf-examples/kadeployg5k-dev.yaml
diff --git a/generators/puppet/conf-examples/kadeployg5k.yaml b/lib/refrepo/gen/puppet/conf-examples/kadeployg5k.yaml
similarity index 100%
rename from generators/puppet/conf-examples/kadeployg5k.yaml
rename to lib/refrepo/gen/puppet/conf-examples/kadeployg5k.yaml
diff --git a/generators/puppet/conf-examples/kavlang5k.yaml b/lib/refrepo/gen/puppet/conf-examples/kavlang5k.yaml
similarity index 100%
rename from generators/puppet/conf-examples/kavlang5k.yaml
rename to lib/refrepo/gen/puppet/conf-examples/kavlang5k.yaml
diff --git a/generators/puppet/conmang5k.rb b/lib/refrepo/gen/puppet/conmang5k.rb
similarity index 100%
rename from generators/puppet/conmang5k.rb
rename to lib/refrepo/gen/puppet/conmang5k.rb
diff --git a/generators/puppet/dhcpg5k.rb b/lib/refrepo/gen/puppet/dhcpg5k.rb
similarity index 100%
rename from generators/puppet/dhcpg5k.rb
rename to lib/refrepo/gen/puppet/dhcpg5k.rb
diff --git a/generators/puppet/kadeployg5k.rb b/lib/refrepo/gen/puppet/kadeployg5k.rb
similarity index 100%
rename from generators/puppet/kadeployg5k.rb
rename to lib/refrepo/gen/puppet/kadeployg5k.rb
diff --git a/generators/puppet/kavlang5k.rb b/lib/refrepo/gen/puppet/kavlang5k.rb
similarity index 100%
rename from generators/puppet/kavlang5k.rb
rename to lib/refrepo/gen/puppet/kavlang5k.rb
diff --git a/generators/puppet/lanpowerg5k.rb b/lib/refrepo/gen/puppet/lanpowerg5k.rb
similarity index 100%
rename from generators/puppet/lanpowerg5k.rb
rename to lib/refrepo/gen/puppet/lanpowerg5k.rb
diff --git a/generators/puppet/templates/bind-site-local.conf.erb b/lib/refrepo/gen/puppet/templates/bind-site-local.conf.erb
similarity index 100%
rename from generators/puppet/templates/bind-site-local.conf.erb
rename to lib/refrepo/gen/puppet/templates/bind-site-local.conf.erb
diff --git a/generators/puppet/templates/bind-site.conf.erb b/lib/refrepo/gen/puppet/templates/bind-site.conf.erb
similarity index 100%
rename from generators/puppet/templates/bind-site.conf.erb
rename to lib/refrepo/gen/puppet/templates/bind-site.conf.erb
diff --git a/generators/puppet/templates/bind.erb b/lib/refrepo/gen/puppet/templates/bind.erb
similarity index 100%
rename from generators/puppet/templates/bind.erb
rename to lib/refrepo/gen/puppet/templates/bind.erb
diff --git a/generators/puppet/templates/conman.erb b/lib/refrepo/gen/puppet/templates/conman.erb
similarity index 100%
rename from generators/puppet/templates/conman.erb
rename to lib/refrepo/gen/puppet/templates/conman.erb
diff --git a/generators/puppet/templates/dhcp.erb b/lib/refrepo/gen/puppet/templates/dhcp.erb
similarity index 100%
rename from generators/puppet/templates/dhcp.erb
rename to lib/refrepo/gen/puppet/templates/dhcp.erb
diff --git a/generators/puppet/templates/kadeployg5k.conf.erb b/lib/refrepo/gen/puppet/templates/kadeployg5k.conf.erb
similarity index 100%
rename from generators/puppet/templates/kadeployg5k.conf.erb
rename to lib/refrepo/gen/puppet/templates/kadeployg5k.conf.erb
diff --git a/generators/puppet/templates/kavlan-cluster.conf.erb b/lib/refrepo/gen/puppet/templates/kavlan-cluster.conf.erb
similarity index 100%
rename from generators/puppet/templates/kavlan-cluster.conf.erb
rename to lib/refrepo/gen/puppet/templates/kavlan-cluster.conf.erb
diff --git a/generators/puppet/templates/kavlan-dhcp.conf.erb b/lib/refrepo/gen/puppet/templates/kavlan-dhcp.conf.erb
similarity index 100%
rename from generators/puppet/templates/kavlan-dhcp.conf.erb
rename to lib/refrepo/gen/puppet/templates/kavlan-dhcp.conf.erb
diff --git a/generators/puppet/templates/kavlan.conf.erb b/lib/refrepo/gen/puppet/templates/kavlan.conf.erb
similarity index 100%
rename from generators/puppet/templates/kavlan.conf.erb
rename to lib/refrepo/gen/puppet/templates/kavlan.conf.erb