diff --git a/generators/wiki/cpu_parameters.rb b/generators/wiki/cpu_parameters.rb
index 88f18d7944be628bea0b2f6d58626a9984c71482..e7ebc7c69cc8d1d87437e541d26ca3bd5ef7a081 100644
--- a/generators/wiki/cpu_parameters.rb
+++ b/generators/wiki/cpu_parameters.rb
@@ -1,6 +1,5 @@
-require_relative '../lib/input_loader'
-require_relative './wiki_generator'
-require_relative './mw_utils'
+$LOAD_PATH.unshift(File.expand_path(File.join(File.dirname(__FILE__), 'lib')))
+require 'wiki_generator'
 
 class CPUParametersGenerator < WikiGenerator
 
diff --git a/generators/wiki/disk_reservation.rb b/generators/wiki/disk_reservation.rb
index 1b781d9445f080bdbf8ea1fd52a3ad7fac92485f..cb9b409cbda9719b5df43337c995e01c28d1b250 100644
--- a/generators/wiki/disk_reservation.rb
+++ b/generators/wiki/disk_reservation.rb
@@ -1,7 +1,6 @@
 # coding: utf-8
-require_relative '../lib/input_loader'
-require_relative './wiki_generator'
-require_relative './mw_utils'
+$LOAD_PATH.unshift(File.expand_path(File.join(File.dirname(__FILE__), 'lib')))
+require 'wiki_generator'
 
 class DiskReservationGenerator < WikiGenerator
 
diff --git a/generators/wiki/hardware.rb b/generators/wiki/hardware.rb
index 2d43ecc6c6a75f630fdf291e35b1733fa50b1045..0b9484786ac50eacc2aaffb44def8dd53ec74a5e 100644
--- a/generators/wiki/hardware.rb
+++ b/generators/wiki/hardware.rb
@@ -1,8 +1,6 @@
 # coding: utf-8
-require 'pp'
-require_relative '../lib/input_loader'
-require_relative './wiki_generator'
-require_relative './mw_utils'
+$LOAD_PATH.unshift(File.expand_path(File.join(File.dirname(__FILE__), 'lib')))
+require 'wiki_generator'
 require_relative './site_hardware.rb'
 
 class G5KHardwareGenerator < WikiGenerator
diff --git a/generators/wiki/mw_utils.rb b/generators/wiki/lib/mw_utils.rb
similarity index 96%
rename from generators/wiki/mw_utils.rb
rename to generators/wiki/lib/mw_utils.rb
index c4743d015d0cdb1c258a0ca21d6da0f1707c943b..b1722f36dca646c0b274d3e1cd07afd7e2f84324 100644
--- a/generators/wiki/mw_utils.rb
+++ b/generators/wiki/lib/mw_utils.rb
@@ -5,7 +5,10 @@ require 'net/http'
 require 'net/https'
 require 'mediawiki_api'
 
-require_relative "../lib/input_loader"
+# also add generators/lib to load path
+$LOAD_PATH.unshift(File.expand_path(File.join(File.dirname(__FILE__), '../../lib')))
+require 'input_loader'
+
 
 #Adding method to mediawiki_api client
 module MediawikiApi
@@ -109,7 +112,7 @@ module G5K
   @@global_hash = nil
   def self.get_global_hash
     if @@global_hash.nil?
-      @@global_hash = load_yaml_file_hierarchy(File.expand_path("../../input/grid5000/", File.dirname(__FILE__)))
+      @@global_hash = load_yaml_file_hierarchy(File.expand_path("../../../input/grid5000/", File.dirname(__FILE__)))
     end
     # return a deep copy of global_hash
     return Marshal.load(Marshal.dump(@@global_hash))
diff --git a/generators/wiki/wiki_generator.rb b/generators/wiki/lib/wiki_generator.rb
similarity index 96%
rename from generators/wiki/wiki_generator.rb
rename to generators/wiki/lib/wiki_generator.rb
index c3fb47e2669f6c7018783bbdc8c8ffb8e0ea46d8..ebd5cbd4af471fb2019f56abfad765b6cff460a9 100644
--- a/generators/wiki/wiki_generator.rb
+++ b/generators/wiki/lib/wiki_generator.rb
@@ -1,8 +1,11 @@
+# also add generators/lib to load path
+$LOAD_PATH.unshift(File.expand_path(File.join(File.dirname(__FILE__), '../../lib')))
+
+require 'input_loader'
 require "optparse"
 require "mediawiki_api"
 require "diffy"
-
-require_relative "./mw_utils"
+require "mw_utils"
 
 class WikiGenerator
 
diff --git a/generators/wiki/oar_properties.rb b/generators/wiki/oar_properties.rb
index e99a8704cf64d84abb47b1050a3c1efacac79aa9..be0b19cfccce5cc0fca166129156685c125a967b 100644
--- a/generators/wiki/oar_properties.rb
+++ b/generators/wiki/oar_properties.rb
@@ -1,10 +1,8 @@
 # coding: utf-8
-require 'pp'
+$LOAD_PATH.unshift(File.expand_path(File.join(File.dirname(__FILE__), 'lib')))
+require 'wiki_generator'
 
-require_relative '../lib/input_loader'
 require_relative '../oar-properties/lib/lib-oar-properties'
-require_relative './wiki_generator'
-require_relative './mw_utils'
 
 class OarPropertiesGenerator < WikiGenerator
 
diff --git a/generators/wiki/site_hardware.rb b/generators/wiki/site_hardware.rb
index 54e8efa6295fcc82de7251c9c5f165fc2ca266ee..d63be846b7da8963df3ab1f681ba0a040870b47d 100644
--- a/generators/wiki/site_hardware.rb
+++ b/generators/wiki/site_hardware.rb
@@ -1,11 +1,6 @@
 # coding: utf-8
-require 'optparse'
-require 'date'
-require 'pp'
-
-require_relative '../lib/input_loader'
-require_relative './wiki_generator'
-require_relative './mw_utils'
+$LOAD_PATH.unshift(File.expand_path(File.join(File.dirname(__FILE__), 'lib')))
+require 'wiki_generator'
 
 class SiteHardwareGenerator < WikiGenerator
 
diff --git a/generators/wiki/site_hardware_data.rb b/generators/wiki/site_hardware_data.rb
deleted file mode 100644
index b62d23c25f00321254a80c14b45dd613c8a6fc88..0000000000000000000000000000000000000000
--- a/generators/wiki/site_hardware_data.rb
+++ /dev/null
@@ -1,6 +0,0 @@
-# coding: utf-8
-require 'pp'
-require_relative './site_hardware.rb'
-require_relative './mw_utils.rb'
-
-pp get_hardware(G5K::SITES)
diff --git a/generators/wiki/site_network.rb b/generators/wiki/site_network.rb
index 3ccf2355beab3b6b8f3c55b4de7de2f1e9fe139d..38f3f3df412a22d280b9228a5c277e36c5053e27 100644
--- a/generators/wiki/site_network.rb
+++ b/generators/wiki/site_network.rb
@@ -1,10 +1,7 @@
 # coding: utf-8
-require 'optparse'
-require 'date'
+$LOAD_PATH.unshift(File.expand_path(File.join(File.dirname(__FILE__), 'lib')))
+require 'wiki_generator'
 
-require_relative '../lib/input_loader'
-require_relative './wiki_generator'
-require_relative './mw_utils'
 require_relative '../input-validators/check-network-description'
 
 # This class generates the network description of each site, in .dot