gistfile1.txt

diff --git a/merb-core/lib/merb-core/bootloader.rb b/merb-core/lib/merb-core/bootloader.rb
index 1330ede..0bc474b 100644
--- a/merb-core/lib/merb-core/bootloader.rb
+++ b/merb-core/lib/merb-core/bootloader.rb
@@ -127,9 +127,6 @@ module Merb
       # :api: plugin
       # @overridable
       def default_framework
-        %w[view model helper controller mailer part].each do |component|
-          Merb.push_path(component.to_sym, Merb.root_path("app/#{component}s"))
-        end
         Merb.push_path(:application,  Merb.root_path("app" / "controllers" / "application.rb"))
         Merb.push_path(:config,       Merb.root_path("config"), nil)
         Merb.push_path(:router,       Merb.dir_for(:config), (Merb::Config[:router_file] || "router.rb"))
@@ -143,6 +140,9 @@ module Merb
         Merb.push_path(:stylesheet,   Merb.dir_for(:public) / "stylesheets", nil)
         Merb.push_path(:javascript,   Merb.dir_for(:public) / "javascripts", nil)
         Merb.push_path(:image,        Merb.dir_for(:public) / "images", nil)
+        %w[view model helper controller mailer part].each do |component|
+          Merb.push_path(component.to_sym, Merb.root_path("app/#{component}s"))
+        end
         nil