works but need some cleanup

config/routes.rb

@@ -1,27 +1,78 @@
-ActionController::Routing::Routes.draw do |map|
-  map.resources :folders, :requirements => {:id => /[^\/]+/}
-  map.resources :contacts, :member => {:add_from_mail => :get}, :collection => {:add_multiple => :get}
-  map.resources :contact_groups
+Rails3::Application.routes.draw do
+    resources :folders
+    resources :contacts do
+        collection do
+            get :add_multiple
+        end
+        member do
+            get :add_from_mail
+        end
+    end
 
-  # Add your own custom routes here.
-  # The priority is based upon order of creation: first created -> highest priority.
-  
-  # Here's a sample route:
-  # map.connect 'products/:id', :controller => 'catalog', :action => 'view'
-  # Keep in mind you can assign values other than :controller and :action
-  map.root :controller=>'webmail', :action=>'index'
+    resources :contact_groups
+    match '/' => 'webmail#index'
+    match 'webmail' => 'webmail#index'
+    match 'webmail/:action' => 'webmail#index'
+    match '/contact/:action' => 'contacts#index'
+    match 'admin/main' => 'login#logout'
+    match ':controller/service.wsdl' => '#wsdl'
+    match '/:controller(/:action(/:id))'
 
-  map.connect 'webmail', :controller=>'webmail', :action=>'index'
-
-  map.connect 'webmail/:action', :controller=>'webmail'
-  
-  map.connect '/contact/:action', :controller=>'contacts'
-  
-  map.connect 'admin/main', :controller=> 'login', :action=>'logout'
-  # Allow downloading Web Service WSDL as a file with an extension
-  # instead of a file named 'wsdl'
-  map.connect ':controller/service.wsdl', :action => 'wsdl'
-  
-  # Install the default route as the lowest priority.
-  map.connect ':controller/:action/:id'
 end
+
+  # The priority is based upon order of creation:
+  # first created -> highest priority.
+
+  # Sample of regular route:
+  #   match 'products/:id' => 'catalog#view'
+  # Keep in mind you can assign values other than :controller and :action
+
+  # Sample of named route:
+  #   match 'products/:id/purchase' => 'catalog#purchase', :as => :purchase
+  # This route can be invoked with purchase_url(:id => product.id)
+
+  # Sample resource route (maps HTTP verbs to controller actions automatically):
+  #   resources :products
+
+  # Sample resource route with options:
+  #   resources :products do
+  #     member do
+  #       get 'short'
+  #       post 'toggle'
+  #     end
+  #
+  #     collection do
+  #       get 'sold'
+  #     end
+  #   end
+
+  # Sample resource route with sub-resources:
+  #   resources :products do
+  #     resources :comments, :sales
+  #     resource :seller
+  #   end
+
+  # Sample resource route with more complex sub-resources
+  #   resources :products do
+  #     resources :comments
+  #     resources :sales do
+  #       get 'recent', :on => :collection
+  #     end
+  #   end
+
+  # Sample resource route within a namespace:
+  #   namespace :admin do
+  #     # Directs /admin/products/* to Admin::ProductsController
+  #     # (app/controllers/admin/products_controller.rb)
+  #     resources :products
+  #   end
+
+  # You can have the root of your site routed with "root"
+  # just remember to delete public/index.html.
+  # root :to => "welcome#index"
+
+  # See how all your routes lay out with "rake routes"
+
+  # This is a legacy wild controller route that's not recommended for RESTful applications.
+  # Note: This route will make all actions in every controller accessible via GET requests.
+  # match ':controller(/:action(/:id(.:format)))'