diff --git a/dynamic_sitemaps.gemspec b/dynamic_sitemaps.gemspec
index 993275c..0ea37f3 100644
--- a/dynamic_sitemaps.gemspec
+++ b/dynamic_sitemaps.gemspec
@@ -1,7 +1,7 @@
 # -*- encoding: utf-8 -*-
 lib = File.expand_path('../lib', __FILE__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
-require 'dynamic_sitemaps/version'
+require 'version'
 
 Gem::Specification.new do |gem|
   gem.name          = "dynamic_sitemaps"
diff --git a/lib/dynamic_sitemaps/generator.rb b/lib/generator.rb
similarity index 100%
rename from lib/dynamic_sitemaps/generator.rb
rename to lib/generator.rb
diff --git a/lib/dynamic_sitemaps/index_generator.rb b/lib/index_generator.rb
similarity index 100%
rename from lib/dynamic_sitemaps/index_generator.rb
rename to lib/index_generator.rb
diff --git a/lib/dynamic_sitemaps/logger.rb b/lib/logger.rb
similarity index 100%
rename from lib/dynamic_sitemaps/logger.rb
rename to lib/logger.rb
diff --git a/lib/dynamic_sitemaps/pinger.rb b/lib/pinger.rb
similarity index 100%
rename from lib/dynamic_sitemaps/pinger.rb
rename to lib/pinger.rb
diff --git a/lib/dynamic_sitemaps/rails/engine.rb b/lib/rails/engine.rb
similarity index 68%
rename from lib/dynamic_sitemaps/rails/engine.rb
rename to lib/rails/engine.rb
index 20cd305..8ca2218 100644
--- a/lib/dynamic_sitemaps/rails/engine.rb
+++ b/lib/rails/engine.rb
@@ -3,7 +3,7 @@ class Engine < Rails::Engine
     engine_name :dynamic_sitemaps
 
     rake_tasks do
-      load "dynamic_sitemaps/tasks/sitemap.rake"
+      load "dynamic_sitemaps/tasks/dynamic_sitemaps.rake"
     end
   end
 end
\ No newline at end of file
diff --git a/lib/dynamic_sitemaps/sitemap.rb b/lib/sitemap.rb
similarity index 100%
rename from lib/dynamic_sitemaps/sitemap.rb
rename to lib/sitemap.rb
diff --git a/lib/dynamic_sitemaps/sitemap_generator.rb b/lib/sitemap_generator.rb
similarity index 100%
rename from lib/dynamic_sitemaps/sitemap_generator.rb
rename to lib/sitemap_generator.rb
diff --git a/lib/dynamic_sitemaps/sitemap_result.rb b/lib/sitemap_result.rb
similarity index 100%
rename from lib/dynamic_sitemaps/sitemap_result.rb
rename to lib/sitemap_result.rb
diff --git a/lib/dynamic_sitemaps/tasks/sitemap.rake b/lib/tasks/dynamic_sitemaps.rake
similarity index 100%
rename from lib/dynamic_sitemaps/tasks/sitemap.rake
rename to lib/tasks/dynamic_sitemaps.rake
diff --git a/lib/dynamic_sitemaps/version.rb b/lib/version.rb
similarity index 100%
rename from lib/dynamic_sitemaps/version.rb
rename to lib/version.rb