diff --git a/generators/README.md b/README.generators.md
similarity index 100%
rename from generators/README.md
rename to README.generators.md
diff --git a/generators/Gemfile.lock b/generators/Gemfile.lock
deleted file mode 100644
index 7826ff4137f9588e19196b71fff0167ffab767d1..0000000000000000000000000000000000000000
--- a/generators/Gemfile.lock
+++ /dev/null
@@ -1,34 +0,0 @@
-GEM
-  remote: https://rubygems.org/
-  specs:
-    hash_validator (0.4.0)
-    hashdiff (0.3.0)
-    ipaddress (0.8.3)
-    json (1.8.3)
-    mime-types (3.0)
-      mime-types-data (~> 3.2015)
-    mime-types-data (3.2016.0221)
-    net-ssh (3.1.1)
-    net-ssh-gateway (1.2.0)
-      net-ssh (>= 2.6.5)
-    net-ssh-multi (1.2.1)
-      net-ssh (>= 2.6.5)
-      net-ssh-gateway (>= 1.2.0)
-    peach (0.5.1)
-    rest-client (1.6.7)
-      mime-types (>= 1.16)
-    ruby-cute (0.4)
-      ipaddress (~> 0.8)
-      json (~> 1.8)
-      net-ssh-multi (~> 1.2)
-      rest-client (= 1.6.7)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  hash_validator
-  hashdiff
-  net-ssh
-  peach
-  ruby-cute
diff --git a/generators/puppet/Rakefile b/generators/puppet/Rakefile
deleted file mode 100644
index 1f9f26a6cc4fde48caa9a33e1c25bd582f38acf0..0000000000000000000000000000000000000000
--- a/generators/puppet/Rakefile
+++ /dev/null
@@ -1,11 +0,0 @@
-all_tasks = [:bindg5k, :conmang5k, :dhcpg5k, :kadeployg5k, :lanpowerg5k]
-
-task :default => all_tasks
-
-all_tasks.each { |t|
-desc "Generate #{t} configuration"
-task t do
-  puts "#{t}.rb -o #{ENV['puppet_repo']} -s #{ENV['sites']}"
-  ruby "#{t}.rb -o #{ENV['puppet_repo']} -s #{ENV['sites']}"
-end
-}
diff --git a/generators/tests/input_loader_tests.rb b/tests/input_loader_tests.rb
similarity index 100%
rename from generators/tests/input_loader_tests.rb
rename to tests/input_loader_tests.rb