diff --git a/keys.module b/keys.module
index bc50861..0691d82 100644
--- a/keys.module
+++ b/keys.module
@@ -143,7 +143,7 @@ function keys_get_key($param, $fields = array('api_key'), $silent = FALSE) {
       $keys['kids'][$param][$fid] = (count($fields) == 1) ? $key->{array_shift($fields)} : $key;
     }
     if (!$hits) {
-      $message = t("Key doesn't exist. !edit.", array('!link' => ((user_access('administer keys')) ? l(t('Edit keys'), 'admin/config/keys/settings/settings') : '')));
+      $message = t("Key doesn't exist. !edit.", array('!link' => ((user_access('administer keys')) ? l(t('Edit keys'), 'admin/config/search/settings/settings') : '')));
     }
   }
   else if (isset($param['service'])) {
@@ -162,7 +162,7 @@ function keys_get_key($param, $fields = array('api_key'), $silent = FALSE) {
       $keys['service_rule'][$id][$fid] = (count($fields) == 1) ? $key->{array_shift($fields)} : $key;
     }
     if (!$hits) {
-      $message = t("Key for '%service' @ '%url' doesn't exist. !edit.", array('%service' => $param['service'], '%url' => $param['url'], '!edit' => ((user_access('administer keys')) ? l(t('Edit keys'), 'admin/config/keys/settings/settings') : '')));
+      $message = t("Key for '%service' @ '%url' doesn't exist. !edit.", array('%service' => $param['service'], '%url' => $param['url'], '!edit' => ((user_access('administer keys')) ? l(t('Edit keys'), 'admin/config/search/settings/settings') : '')));
     }
   }
   else {
diff --git a/keys_ui/keys_ui.admin.inc b/keys_ui/keys_ui.admin.inc
index f2d62ae..4f694ac 100644
--- a/keys_ui/keys_ui.admin.inc
+++ b/keys_ui/keys_ui.admin.inc
@@ -35,7 +35,7 @@ function keys_ui_key_form($form, &$form_state, $key = NULL) {
     '#value' => t("Save"),
   );
   $form['#submit'][] = 'keys_ui_key_form_submit';
-  $form['#redirect'] = 'admin/config/keys/settings';
+  $form['#redirect'] = 'admin/config/search/settings';
 
   return $form;
 }
@@ -53,7 +53,7 @@ function keys_ui_key_delete_form($form, &$form_state, $key) {
 
   return confirm_form($form,
     t("Are you sure you want to delete key for '%service' @ '%rule'?", array('%service' => $key->service, '%rule' => $key->rule)),
-    'admin/config/keys/settings/settings',
+    'admin/config/search/settings/settings',
     t('This action cannot be undone.'),
     t('Delete'),
     t('Cancel')
@@ -65,7 +65,7 @@ function keys_ui_key_delete_form_submit($form, &$form_state) {
     ->condition('kid', $form_state['values']['kid'])
     ->execute();
   drupal_set_message(t('Key deleted successfully.'));
-  $form_state['redirect'] = 'admin/config/keys/settings/settings';
+  $form_state['redirect'] = 'admin/config/search/settings/settings';
 }
 
 /*******************************************************************************
@@ -111,8 +111,8 @@ function theme_keys_ui_list($vars) {
   );
 
   foreach ($keys as $key) {
-    $links['edit']['href'] = 'admin/config/keys/settings/'. $key->kid .'/edit';
-    $links['delete']['href'] = 'admin/config/keys/settings/'. $key->kid .'/delete';
+    $links['edit']['href'] = 'admin/config/search/settings/'. $key->kid .'/edit';
+    $links['delete']['href'] = 'admin/config/search/settings/'. $key->kid .'/delete';
     $rows[] = array(
       array('data' => $list[$key->service]['name']),
       array('data' => $key->rule),
diff --git a/keys_ui/keys_ui.module b/keys_ui/keys_ui.module
index b49491b..e250a35 100644
--- a/keys_ui/keys_ui.module
+++ b/keys_ui/keys_ui.module
@@ -26,39 +26,30 @@ function keys_ui_menu() {
     'file' => 'keys_ui.admin.inc'
   );
 
-  $items['admin/config/keys'] = array(
-    'title' => 'Keys',
-    'description' => 'Manage API keys',
-    'position' => 'right',
-    'page callback' => 'system_admin_menu_block_page',
-    'access arguments' => array('administer keys'),
-    'file' => 'system.admin.inc',
-    'file path' => drupal_get_path('module', 'system')
-  );
-  $items['admin/config/keys/settings'] = array(
+  $items['admin/config/search/settings'] = array(
     'title' => 'Keys',
     'description' => 'List, edit or add keys.',
     'page callback' => 'keys_ui_list',
     'weight' => -20
   ) + $common;
-  $items['admin/config/keys/settings/list'] = array(
+  $items['admin/config/search/settings/list'] = array(
     'title' => 'List',
     'page callback' => 'keys_ui_list',
     'type' => MENU_DEFAULT_LOCAL_TASK,
     'weight' => -10
   ) + $common;
-  $items['admin/config/keys/settings/add'] = array(
+  $items['admin/config/search/settings/add'] = array(
     'title' => 'Add',
     'page callback' => 'drupal_get_form',
     'page arguments' => array('keys_ui_key_form'),
     'type' => MENU_LOCAL_TASK
   ) + $common;
-  $items['admin/config/keys/settings/%keys_key/edit'] = array(
+  $items['admin/config/search/settings/%keys_key/edit'] = array(
     'page callback' => 'drupal_get_form',
     'page arguments' => array('keys_ui_key_form', 4),
     'type' => MENU_CALLBACK
   ) + $common;
-  $items['admin/config/keys/settings/%keys_key/delete'] = array(
+  $items['admin/config/search/settings/%keys_key/delete'] = array(
     'page callback' => 'drupal_get_form',
     'page arguments' => array('keys_ui_key_delete_form', 4),
     'type' => MENU_CALLBACK