diff --git a/generators/wiki/cpu_parameters.rb b/generators/wiki/cpu_parameters.rb
index 930d3641232315a5d2f50bcc13494db82333768e..83f1ea73f85bcb8a55cddb06a10cffebb82ca0b1 100644
--- a/generators/wiki/cpu_parameters.rb
+++ b/generators/wiki/cpu_parameters.rb
@@ -58,20 +58,22 @@ class CPUParametersGenerator < WikiGenerator
   end
 end
 
-generator = CPUParametersGenerator.new("Generated/CPUParameters")
+if __FILE__ == $0
+  generator = CPUParametersGenerator.new("Generated/CPUParameters")
 
-options = WikiGenerator::parse_options
-if (options)
-  ret = 2
-  begin
-    ret = generator.exec(options)
-  rescue MediawikiApi::ApiError => e
-    puts e, e.backtrace
-    ret = 3
-  rescue StandardError => e
-    puts e, e.backtrace
-    ret = 4
-  ensure
-    exit(ret)
+  options = WikiGenerator::parse_options
+  if (options)
+    ret = 2
+    begin
+      ret = generator.exec(options)
+    rescue MediawikiApi::ApiError => e
+      puts e, e.backtrace
+      ret = 3
+    rescue StandardError => e
+      puts e, e.backtrace
+      ret = 4
+    ensure
+      exit(ret)
+    end
   end
 end
diff --git a/generators/wiki/disk_reservation.rb b/generators/wiki/disk_reservation.rb
index 735eeeed78bf625ceba7aeca18e28a34586a2f5a..bb23c833e301b40425994fa8f392bbd111bfde98 100644
--- a/generators/wiki/disk_reservation.rb
+++ b/generators/wiki/disk_reservation.rb
@@ -62,20 +62,23 @@ class DiskReservationGenerator < WikiGenerator
   end
 end
 
-generator = DiskReservationGenerator.new("Generated/DiskReservation")
+if __FILE__ == $0
+  generator = DiskReservationGenerator.new("Generated/DiskReservation")
 
-options = WikiGenerator::parse_options
-if (options)
-  ret = 2
-  begin
-    ret = generator.exec(options)
-  rescue MediawikiApi::ApiError => e
-    puts e, e.backtrace
-    ret = 3
-  rescue StandardError => e
-    puts e, e.backtrace
-    ret = 4
-  ensure
-    exit(ret)
+  options = WikiGenerator::parse_options
+  pp options
+  if (options)
+    ret = 2
+    begin
+      ret = generator.exec(options)
+    rescue MediawikiApi::ApiError => e
+      puts e, e.backtrace
+      ret = 3
+    rescue StandardError => e
+      puts e, e.backtrace
+      ret = 4
+    ensure
+      exit(ret)
+    end
   end
 end
diff --git a/generators/wiki/hardware.rb b/generators/wiki/hardware.rb
index 3eb3e0f49d88e8bc2bcd22fd1bd003757deae51a..e0439a961a50329e3f5ee7f139da418c7075d151 100644
--- a/generators/wiki/hardware.rb
+++ b/generators/wiki/hardware.rb
@@ -270,21 +270,23 @@ class G5KHardwareGenerator < WikiGenerator
   end  
 end
 
-generator = G5KHardwareGenerator.new("Hardware")
+if __FILE__ == $0
+  generator = G5KHardwareGenerator.new("Hardware")
 
-options = WikiGenerator::parse_options
-if (options)
-  ret = 2
-  begin
-    ret = generator.exec(options)
-  rescue MediawikiApi::ApiError => e
-    puts e, e.backtrace
-    ret = 3
-  rescue StandardError => e
-    puts "Error with node: #{generator.instance_variable_get(:@node)}"
-    puts e, e.backtrace
-    ret = 4
-  ensure
-    exit(ret)
+  options = WikiGenerator::parse_options
+  if (options)
+    ret = 2
+    begin
+      ret = generator.exec(options)
+    rescue MediawikiApi::ApiError => e
+      puts e, e.backtrace
+      ret = 3
+    rescue StandardError => e
+      puts "Error with node: #{generator.instance_variable_get(:@node)}"
+      puts e, e.backtrace
+      ret = 4
+    ensure
+      exit(ret)
+    end
   end
 end
diff --git a/generators/wiki/oar_properties.rb b/generators/wiki/oar_properties.rb
index b094d3aefe421cd1b9db1c71542ad1a9a93b478c..c24a041fe01c2d5b3248e6abe502fe31322c8e0b 100644
--- a/generators/wiki/oar_properties.rb
+++ b/generators/wiki/oar_properties.rb
@@ -222,21 +222,22 @@ class OarPropertiesGenerator < WikiGenerator
   end
 end
 
-generator = OarPropertiesGenerator.new("Generated/OAR_Properties")
-
-options = WikiGenerator::parse_options
-if (options)
-  ret = 2
-  begin
-    ret = generator.exec(options)
-  rescue MediawikiApi::ApiError => e
-    puts e, e.backtrace
-    ret = 3
-  rescue StandardError => e
-    puts e, e.backtrace
-    ret = 4
-  ensure
-    exit(ret)
+if __FILE__ == $0
+  generator = OarPropertiesGenerator.new("Generated/OAR_Properties")
+
+  options = WikiGenerator::parse_options
+  if (options)
+    ret = 2
+    begin
+      ret = generator.exec(options)
+    rescue MediawikiApi::ApiError => e
+      puts e, e.backtrace
+      ret = 3
+    rescue StandardError => e
+      puts e, e.backtrace
+      ret = 4
+    ensure
+      exit(ret)
+    end
   end
 end
-
diff --git a/generators/wiki/site_network.rb b/generators/wiki/site_network.rb
index b1e0cb05ebe0169f516d9d38c1b6dfe028ec87c2..e1ea81133fdd6dbb3ab780f5599b660e33c76518 100644
--- a/generators/wiki/site_network.rb
+++ b/generators/wiki/site_network.rb
@@ -29,23 +29,25 @@ class SiteNetworkGenerator < WikiGenerator
   end
 end
 
-options = WikiGenerator::parse_options
+if __FILE__ == $0
+  options = WikiGenerator::parse_options
 
-if (options)
-  ret = 2
-  begin
-    ret = true
-    generators = options[:sites].map{ |site| SiteNetworkGenerator.new('Generated/' + site.capitalize + 'Network', site) }
-    generators.each{ |generator|
-      ret &= generator.exec(options)
-    }
-  rescue MediawikiApi::ApiError => e
-    puts e, e.backtrace
-    ret = 3
-  rescue StandardError => e
-    puts e, e.backtrace
-    ret = 4
-  ensure
-    exit(ret)
+  if (options)
+    ret = 2
+    begin
+      ret = true
+      generators = options[:sites].map{ |site| SiteNetworkGenerator.new('Generated/' + site.capitalize + 'Network', site) }
+      generators.each{ |generator|
+        ret &= generator.exec(options)
+      }
+    rescue MediawikiApi::ApiError => e
+      puts e, e.backtrace
+      ret = 3
+    rescue StandardError => e
+      puts e, e.backtrace
+      ret = 4
+    ensure
+      exit(ret)
+    end
   end
 end