reorganized routes.rb
merge fix