diff --git a/railties/lib/generator/generators/app.thor b/railties/lib/generator/generators/app.thor
index e2b62729b4d8a9617362f5cf63cbafdb31e28095..8dc94641b3583f6fe1257dbd44d5639437a43163 100644
--- a/railties/lib/generator/generators/app.thor
+++ b/railties/lib/generator/generators/app.thor
@@ -23,7 +23,7 @@ class App < Thor::Group
                           :desc => "Preconfigure for selected database (options: #{DATABASES.join('/')})"
 
   class_option :with_dispatchers, :type => :boolean, :aliases => "-D", :default => false,
-                                  :desc => "Add CGI/FastCGI/mod_ruby dispatches code"
+                                  :desc => "Add CGI/FastCGI/mod_ruby dispatchers code"
 
   class_option :freeze, :type => :boolean, :aliases => "-f", :default => false,
                         :desc => "Freeze Rails in vendor/rails from the gems"
@@ -108,9 +108,7 @@ class App < Thor::Group
   end
 
   def create_javascript_files
-    %w( prototype effects dragdrop controls application ).each do |javascript|
-      copy_file "prototype/#{javascript}.js", "public/javascripts/#{javascript}.js"
-    end
+    directory "javascripts/prototype", "public/javascripts"
   end
 
   def create_script_files
diff --git a/railties/lib/generator/templates/app/prototype/application.js b/railties/lib/generator/templates/app/javascripts/prototype/application.js
similarity index 100%
rename from railties/lib/generator/templates/app/prototype/application.js
rename to railties/lib/generator/templates/app/javascripts/prototype/application.js
diff --git a/railties/lib/generator/templates/app/prototype/controls.js b/railties/lib/generator/templates/app/javascripts/prototype/controls.js
similarity index 100%
rename from railties/lib/generator/templates/app/prototype/controls.js
rename to railties/lib/generator/templates/app/javascripts/prototype/controls.js
diff --git a/railties/lib/generator/templates/app/prototype/dragdrop.js b/railties/lib/generator/templates/app/javascripts/prototype/dragdrop.js
similarity index 100%
rename from railties/lib/generator/templates/app/prototype/dragdrop.js
rename to railties/lib/generator/templates/app/javascripts/prototype/dragdrop.js
diff --git a/railties/lib/generator/templates/app/prototype/effects.js b/railties/lib/generator/templates/app/javascripts/prototype/effects.js
similarity index 100%
rename from railties/lib/generator/templates/app/prototype/effects.js
rename to railties/lib/generator/templates/app/javascripts/prototype/effects.js
diff --git a/railties/lib/generator/templates/app/prototype/prototype.js b/railties/lib/generator/templates/app/javascripts/prototype/prototype.js
similarity index 100%
rename from railties/lib/generator/templates/app/prototype/prototype.js
rename to railties/lib/generator/templates/app/javascripts/prototype/prototype.js