diff --git a/app/controllers/keys_controller.rb b/app/controllers/profiles/keys_controller.rb
similarity index 67%
rename from app/controllers/keys_controller.rb
rename to app/controllers/profiles/keys_controller.rb
index 1a25d834e129220e21bb57e2a1c4a2a844fd20fe..24a01040f52abdf206af3ed9f3aed6965fc6a196 100644
--- a/app/controllers/keys_controller.rb
+++ b/app/controllers/profiles/keys_controller.rb
@@ -1,6 +1,5 @@
-class KeysController < ApplicationController
+class Profiles::KeysController < ApplicationController
   layout "profile"
-  respond_to :js, :html
 
   def index
     @keys = current_user.keys.all
@@ -12,15 +11,16 @@ class KeysController < ApplicationController
 
   def new
     @key = current_user.keys.new
-
-    respond_with(@key)
   end
 
   def create
     @key = current_user.keys.new(params[:key])
-    @key.save
 
-    respond_with(@key)
+    if @key.save
+      redirect_to profile_key_path(@key)
+    else
+      render 'new'
+    end
   end
 
   def destroy
@@ -28,7 +28,7 @@ class KeysController < ApplicationController
     @key.destroy
 
     respond_to do |format|
-      format.html { redirect_to keys_url }
+      format.html { redirect_to profile_keys_url }
       format.js { render nothing: true }
     end
   end
diff --git a/app/controllers/notifications_controller.rb b/app/controllers/profiles/notifications_controller.rb
similarity index 93%
rename from app/controllers/notifications_controller.rb
rename to app/controllers/profiles/notifications_controller.rb
index 370bdaa2fa1e4b2494597555ad641127a5d885da..5c492aeb49d1a7043fb2569f353092a31fcef4fe 100644
--- a/app/controllers/notifications_controller.rb
+++ b/app/controllers/profiles/notifications_controller.rb
@@ -1,4 +1,4 @@
-class NotificationsController < ApplicationController
+class Profiles::NotificationsController < ApplicationController
   layout 'profile'
 
   def show
diff --git a/app/controllers/passwords_controller.rb b/app/controllers/profiles/passwords_controller.rb
similarity index 92%
rename from app/controllers/passwords_controller.rb
rename to app/controllers/profiles/passwords_controller.rb
index 0e5b42178a71af6b8b2b65e9d252007534bd0a4b..432899f857df65ce817a382b4582f17f1ec617f1 100644
--- a/app/controllers/passwords_controller.rb
+++ b/app/controllers/profiles/passwords_controller.rb
@@ -1,4 +1,4 @@
-class PasswordsController < ApplicationController
+class Profiles::PasswordsController < ApplicationController
   layout 'navless'
 
   skip_before_filter :check_password_expiration
diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
index 8ccb2380d62fb93628b65858695b82917ad254a8..4ab8cc87f75eddc2248eadf23e1e05747f4c25fb 100644
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -95,7 +95,7 @@ module ApplicationHelper
 
     default_nav = [
       { label: "My Profile", url: profile_path },
-      { label: "My SSH Keys", url: keys_path },
+      { label: "My SSH Keys", url: profile_keys_path },
       { label: "My Dashboard", url: root_path },
       { label: "Admin Section", url: admin_root_path },
     ]
diff --git a/app/views/keys/_show.html.haml b/app/views/keys/_show.html.haml
deleted file mode 100644
index 52bbea6fc7bad85d3f63303fce3934edb3ee6234..0000000000000000000000000000000000000000
--- a/app/views/keys/_show.html.haml
+++ /dev/null
@@ -1,12 +0,0 @@
-%tr
-  %td
-    = link_to key_path(key) do
-      %strong= key.title
-  %td
-    %span.cgray
-      Added
-      = time_ago_in_words(key.created_at)
-      ago
-  %td
-    = link_to 'Remove', key, confirm: 'Are you sure?', method: :delete, class: "btn btn-small btn-remove delete-key pull-right"
-
diff --git a/app/views/keys/edit.html.haml b/app/views/keys/edit.html.haml
deleted file mode 100644
index 60a3afedddca735d2f4337ebfeef3ab13ddb48af..0000000000000000000000000000000000000000
--- a/app/views/keys/edit.html.haml
+++ /dev/null
@@ -1,7 +0,0 @@
-%h1 Editing key
-
-= render 'form'
-
-= link_to 'Show', @key
-\|
-= link_to 'Back', keys_path
diff --git a/app/views/layouts/nav/_profile.html.haml b/app/views/layouts/nav/_profile.html.haml
index e5e4b27c6658ecac3d8af9a9b1147456db8c01e8..c2db7067e4443f45bd49b5d94d0471c9ddd8696d 100644
--- a/app/views/layouts/nav/_profile.html.haml
+++ b/app/views/layouts/nav/_profile.html.haml
@@ -7,7 +7,7 @@
   = nav_link(controller: :notifications) do
     = link_to "Notifications", profile_notifications_path
   = nav_link(controller: :keys) do
-    = link_to keys_path do
+    = link_to profile_keys_path do
       SSH Keys
       %span.count= current_user.keys.count
   = nav_link(path: 'profiles#design') do
diff --git a/app/views/keys/_form.html.haml b/app/views/profiles/keys/_form.html.haml
similarity index 78%
rename from app/views/keys/_form.html.haml
rename to app/views/profiles/keys/_form.html.haml
index fe26216b1d5acf17eefe9ce465d7aac32fd91fa4..59808d6002219ddaee2a70528bd6535f50b3e84f 100644
--- a/app/views/keys/_form.html.haml
+++ b/app/views/profiles/keys/_form.html.haml
@@ -1,6 +1,6 @@
 %div
-  = form_for @key do |f|
-    -if @key.errors.any?
+  = form_for [:profile, @key] do |f|
+    - if @key.errors.any?
       .alert.alert-error
         %ul
           - @key.errors.full_messages.each do |msg|
@@ -20,5 +20,5 @@
 
     .actions
       = f.submit 'Save', class: "btn btn-save"
-      = link_to "Cancel", keys_path, class: "btn btn-cancel"
+      = link_to "Cancel", profile_keys_path, class: "btn btn-cancel"
 
diff --git a/app/views/profiles/keys/_key.html.haml b/app/views/profiles/keys/_key.html.haml
new file mode 100644
index 0000000000000000000000000000000000000000..a71ad6295cd139251ceb96af6d306c73a57c787c
--- /dev/null
+++ b/app/views/profiles/keys/_key.html.haml
@@ -0,0 +1,12 @@
+%tr
+  %td
+    = link_to profile_key_path(key) do
+      %strong= key.title
+  %td
+    %span.cgray
+      Added
+      = time_ago_in_words(key.created_at)
+      ago
+  %td
+    = link_to 'Remove', profile_key_path(key), confirm: 'Are you sure?', method: :delete, class: "btn btn-small btn-remove delete-key pull-right"
+
diff --git a/app/views/profiles/keys/edit.html.haml b/app/views/profiles/keys/edit.html.haml
new file mode 100644
index 0000000000000000000000000000000000000000..08c5a3dfe1efe50ecc46e109b280d0c60af5b9d4
--- /dev/null
+++ b/app/views/profiles/keys/edit.html.haml
@@ -0,0 +1,7 @@
+%h1 Editing key
+
+= render 'form'
+
+= link_to 'Show', profile_keys_path(key)
+\|
+= link_to 'Back', profile_keys_path
diff --git a/app/views/keys/index.html.haml b/app/views/profiles/keys/index.html.haml
similarity index 71%
rename from app/views/keys/index.html.haml
rename to app/views/profiles/keys/index.html.haml
index 7730b344a7db039935efaf5806883d907a187547..b22805bc862de9d86f82e988fb6b508ce33880a4 100644
--- a/app/views/keys/index.html.haml
+++ b/app/views/profiles/keys/index.html.haml
@@ -1,6 +1,6 @@
 %h3.page_title
   SSH Keys
-  = link_to "Add new", new_key_path, class: "btn pull-right"
+  = link_to "Add new", new_profile_key_path, class: "btn pull-right"
 
 %hr
 %p.slead
@@ -13,8 +13,7 @@
       %th Name
       %th Added
       %th
-  - @keys.each do |key|
-    = render(partial: 'show', locals: {key: key})
+  = render @keys
   - if @keys.blank?
     %tr
       %td{colspan: 3}
diff --git a/app/views/keys/new.html.haml b/app/views/profiles/keys/new.html.haml
similarity index 100%
rename from app/views/keys/new.html.haml
rename to app/views/profiles/keys/new.html.haml
diff --git a/app/views/keys/show.html.haml b/app/views/profiles/keys/show.html.haml
similarity index 53%
rename from app/views/keys/show.html.haml
rename to app/views/profiles/keys/show.html.haml
index 059fe5e5806f705ab03b2b819693da699f4972f0..64c6621ea5fccbe8ec7f50b1168c4947ff35ef4f 100644
--- a/app/views/keys/show.html.haml
+++ b/app/views/profiles/keys/show.html.haml
@@ -5,10 +5,10 @@
     created at
     = @key.created_at.stamp("Aug 21, 2011")
 .back_link
-  = link_to keys_path do
+  = link_to profile_keys_path do
     &larr; To keys list
 %hr
 
 %pre= @key.key
 .pull-right
-  = link_to 'Remove', @key, confirm: 'Are you sure?', method: :delete, class: "btn btn-remove delete-key"
+  = link_to 'Remove', profile_key_path(@key), confirm: 'Are you sure?', method: :delete, class: "btn btn-remove delete-key"
diff --git a/app/views/notifications/_settings.html.haml b/app/views/profiles/notifications/_settings.html.haml
similarity index 100%
rename from app/views/notifications/_settings.html.haml
rename to app/views/profiles/notifications/_settings.html.haml
diff --git a/app/views/notifications/show.html.haml b/app/views/profiles/notifications/show.html.haml
similarity index 100%
rename from app/views/notifications/show.html.haml
rename to app/views/profiles/notifications/show.html.haml
diff --git a/app/views/notifications/update.js.haml b/app/views/profiles/notifications/update.js.haml
similarity index 100%
rename from app/views/notifications/update.js.haml
rename to app/views/profiles/notifications/update.js.haml
diff --git a/app/views/passwords/new.html.haml b/app/views/profiles/passwords/new.html.haml
similarity index 100%
rename from app/views/passwords/new.html.haml
rename to app/views/profiles/passwords/new.html.haml
diff --git a/app/views/profiles/show.html.haml b/app/views/profiles/show.html.haml
index 7ca2546afdfc0ecea422a8483f328df2e1c96e26..7ca7583cd32939a71fddcc209b416765e2d6a927 100644
--- a/app/views/profiles/show.html.haml
+++ b/app/views/profiles/show.html.haml
@@ -83,9 +83,9 @@
         %legend
           SSH public keys:
           %span.pull-right
-            = link_to pluralize(current_user.keys.count, 'key'), keys_path
+            = link_to pluralize(current_user.keys.count, 'key'), profile_keys_path
         .padded
-          = link_to "Add Public Key", new_key_path, class: "btn btn-small"
+          = link_to "Add Public Key", new_profile_key_path, class: "btn btn-small"
 
   .form-actions
     = f.submit 'Save', class: "btn btn-save"
diff --git a/config/routes.rb b/config/routes.rb
index a59e6b7ce5b71be57ce4d11be8d6ab8536524ea3..c6b25e460cd3ee1444c3aaa53886af4d45eb3468 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -113,11 +113,13 @@ Gitlab::Application.routes.draw do
       put :update_username
     end
 
-    resource :notifications, only: [:show, :update]
-    resource :password, only: [:new, :create]
+    scope module: :profiles do
+      resource :notifications, only: [:show, :update]
+      resource :password, only: [:new, :create]
+      resources :keys
+    end
   end
 
-  resources :keys
   match "/u/:username" => "users#show", as: :user, constraints: { username: /.*/ }
 
 
diff --git a/features/steps/profile/profile_ssh_keys.rb b/features/steps/profile/profile_ssh_keys.rb
index a280ce6f89c845fcf9b80aac3908674e287a061b..7871eabcb5d52cdf12f68564879aacb5332a89d3 100644
--- a/features/steps/profile/profile_ssh_keys.rb
+++ b/features/steps/profile/profile_ssh_keys.rb
@@ -21,7 +21,7 @@ class ProfileSshKeys < Spinach::FeatureSteps
     key = Key.find_by_title("Laptop")
     page.should have_content(key.title)
     page.should have_content(key.key)
-    current_path.should == key_path(key)
+    current_path.should == profile_key_path(key)
   end
 
   Given 'I click link "Work"' do
@@ -33,7 +33,7 @@ class ProfileSshKeys < Spinach::FeatureSteps
   end
 
   Then 'I visit profile keys page' do
-    visit keys_path
+    visit profile_keys_path
   end
 
   And 'I should not see "Work" ssh key' do
diff --git a/features/steps/shared/paths.rb b/features/steps/shared/paths.rb
index 21b6159bce33010c95cd6a9e40a7ff1676114daa..b2c23cf11c94e6135fe9e2298dc75258e67dfd6f 100644
--- a/features/steps/shared/paths.rb
+++ b/features/steps/shared/paths.rb
@@ -70,7 +70,7 @@ module SharedPaths
   end
 
   step 'I visit profile SSH keys page' do
-    visit keys_path
+    visit profile_keys_path
   end
 
   step 'I visit profile design page' do
diff --git a/spec/routing/notifications_routing_spec.rb b/spec/routing/notifications_routing_spec.rb
index 6880d2819d14c7a4c2da30d3b128742833d33cbe..112b825e0230cd8a1c04d269b6890e01bd9358d8 100644
--- a/spec/routing/notifications_routing_spec.rb
+++ b/spec/routing/notifications_routing_spec.rb
@@ -1,13 +1,13 @@
 require "spec_helper"
 
-describe NotificationsController do
+describe Profiles::NotificationsController do
   describe "routing" do
     it "routes to #show" do
-      get("/profile/notifications").should route_to("notifications#show")
+      get("/profile/notifications").should route_to("profiles/notifications#show")
     end
 
     it "routes to #update" do
-      put("/profile/notifications").should route_to("notifications#update")
+      put("/profile/notifications").should route_to("profiles/notifications#update")
     end
   end
 end
diff --git a/spec/routing/routing_spec.rb b/spec/routing/routing_spec.rb
index aa3952f74b68503abff4603d5b51d7ab6f3b004a..cc2a141c454e463ff50d6f7e86f9b9ec24bfe13a 100644
--- a/spec/routing/routing_spec.rb
+++ b/spec/routing/routing_spec.rb
@@ -155,33 +155,33 @@ end
 #      key GET    /keys/:id(.:format)      keys#show
 #          PUT    /keys/:id(.:format)      keys#update
 #          DELETE /keys/:id(.:format)      keys#destroy
-describe KeysController, "routing" do
+describe Profiles::KeysController, "routing" do
   it "to #index" do
-    get("/keys").should route_to('keys#index')
+    get("/profile/keys").should route_to('profiles/keys#index')
   end
 
   it "to #create" do
-    post("/keys").should route_to('keys#create')
+    post("/profile/keys").should route_to('profiles/keys#create')
   end
 
   it "to #new" do
-    get("/keys/new").should route_to('keys#new')
+    get("/profile/keys/new").should route_to('profiles/keys#new')
   end
 
   it "to #edit" do
-    get("/keys/1/edit").should route_to('keys#edit', id: '1')
+    get("/profile/keys/1/edit").should route_to('profiles/keys#edit', id: '1')
   end
 
   it "to #show" do
-    get("/keys/1").should route_to('keys#show', id: '1')
+    get("/profile/keys/1").should route_to('profiles/keys#show', id: '1')
   end
 
   it "to #update" do
-    put("/keys/1").should route_to('keys#update', id: '1')
+    put("/profile/keys/1").should route_to('profiles/keys#update', id: '1')
   end
 
   it "to #destroy" do
-    delete("/keys/1").should route_to('keys#destroy', id: '1')
+    delete("/profile/keys/1").should route_to('profiles/keys#destroy', id: '1')
   end
 end