diff --git a/generators/devise_install/USAGE b/generators/devise_install/USAGE
deleted file mode 100644
index 60853904..00000000
--- a/generators/devise_install/USAGE
+++ /dev/null
@@ -1,3 +0,0 @@
-To copy a Devise initializer to your Rails App, with some configuration values, just do:
-
-    script/generate devise_install
diff --git a/generators/devise_install/devise_install_generator.rb b/generators/devise_install/devise_install_generator.rb
deleted file mode 100644
index 27b669c7..00000000
--- a/generators/devise_install/devise_install_generator.rb
+++ /dev/null
@@ -1,15 +0,0 @@
-class DeviseInstallGenerator < Rails::Generator::Base
-
-  def manifest
-    record do |m|
-      m.directory "config/initializers"
-      m.template  "devise.rb", "config/initializers/devise.rb"
-
-      m.directory "config/locales"
-      m.file      "../../../lib/devise/locales/en.yml", "config/locales/devise.en.yml"
-
-      m.readme "README"
-    end
-  end
-
-end
diff --git a/lib/generators/devise/USAGE b/lib/generators/devise/USAGE
deleted file mode 100644
index 43ad8010..00000000
--- a/lib/generators/devise/USAGE
+++ /dev/null
@@ -1,5 +0,0 @@
-To create a devise resource user:
-
-    script/generate devise User
-
-This will generate a model named User (if one does not exist), add devise configuration, a route map for devise called :users and a migration file for table :users with default devise modules.
diff --git a/lib/generators/devise/devise_generator.rb b/lib/generators/devise/devise_generator.rb
index b864625c..f0985e66 100644
--- a/lib/generators/devise/devise_generator.rb
+++ b/lib/generators/devise/devise_generator.rb
@@ -3,6 +3,9 @@ require 'rails/generators/migration'
 class DeviseGenerator < Rails::Generators::NamedBase
   include Rails::Generators::Migration
 
+  desc "Generates a model with the given NAME (if one does not exist) with devise " <<
+       "configuration plus a migration file and devise routes."
+
   def self.source_root
     @_devise_source_root ||= File.expand_path("../templates", __FILE__)
   end
diff --git a/lib/generators/devise_install/devise_install_generator.rb b/lib/generators/devise_install/devise_install_generator.rb
new file mode 100644
index 00000000..b9e2e9ba
--- /dev/null
+++ b/lib/generators/devise_install/devise_install_generator.rb
@@ -0,0 +1,25 @@
+class DeviseInstallGenerator < Rails::Generators::Base
+  desc "Creates a Devise initializer and copy locale files to your application."
+
+  def self.source_root
+    @_devise_source_root ||= File.expand_path("../templates", __FILE__)
+  end
+
+  def copy_initializer
+    template "devise.rb", "config/initializers/devise.rb"
+  end
+
+  def copy_locale
+    copy_file "../../../../config/locales/en.yml", "config/locales/devise.en.yml"    
+  end
+
+  def show_readme
+    readme "README"
+  end
+
+  protected
+  
+  def readme(path)
+    say File.read(File.expand_path(path, self.class.source_root))
+  end
+end
\ No newline at end of file
diff --git a/generators/devise_install/templates/README b/lib/generators/devise_install/templates/README
similarity index 100%
rename from generators/devise_install/templates/README
rename to lib/generators/devise_install/templates/README
diff --git a/generators/devise_install/templates/devise.rb b/lib/generators/devise_install/templates/devise.rb
similarity index 100%
rename from generators/devise_install/templates/devise.rb
rename to lib/generators/devise_install/templates/devise.rb