diff --git a/features.admin.inc b/features.admin.inc
index 2483ece..77e5dd1 100644
--- a/features.admin.inc
+++ b/features.admin.inc
@@ -954,7 +954,7 @@ function features_admin_form($form, $form_state) {
       $description .= "<div class='conflicts'>". t('Conflicts with: !conflicts', array('!conflicts' => implode(', ', $module_conflicts))) ."</div>";
     }
 
-    $href = "admin/structure/features/{$name}";
+    $href = "admin/structure/features/manage/{$name}";
     $module_name = (user_access('administer features')) ? l($module->info['name'], $href) : $module->info['name'];
     $form[$package]['status'][$name] = array(
       '#type' => 'checkbox',
@@ -981,7 +981,7 @@ function features_admin_form($form, $form_state) {
       // Add status link
       if ($module->status) {
         $state = theme('features_storage_link', array('storage' => FEATURES_CHECKING, 'path' => $href));
-        $state .= l(t('Check'), "admin/structure/features/{$name}/status", array('attributes' => array('class' => array('admin-check'))));
+        $state .= l(t('Check'), "admin/structure/features/manage/{$name}/status", array('attributes' => array('class' => array('admin-check'))));
         $state .= theme('features_storage_link', array('storage' => FEATURES_REBUILDING, 'path' => $href));
         $state .= theme('features_storage_link', array('storage' => FEATURES_NEEDS_REVIEW, 'path' =>  $href));
         $state .= theme('features_storage_link', array('storage' => FEATURES_OVERRIDDEN, 'path' =>  $href));
@@ -999,7 +999,7 @@ function features_admin_form($form, $form_state) {
 
       // Add in recreate link
       $form[$package]['actions'][$name] = array(
-        '#markup' => l(t('Recreate'), "admin/structure/features/{$name}/recreate", array('attributes' => array('class' => array('admin-update')))),
+        '#markup' => l(t('Recreate'), "admin/structure/features/manage/{$name}/recreate", array('attributes' => array('class' => array('admin-update')))),
       );
     }
   }
@@ -1081,7 +1081,7 @@ function features_admin_components($form, $form_state, $feature) {
       );
     }
     if (module_exists('diff')) {
-      $diffpath = "admin/structure/features/{$feature->name}/diff/{$component}";
+      $diffpath = "admin/structure/features/manage/{$feature->name}/diff/{$component}";
       $item = menu_get_item($diffpath);
       $path = ($item && $item['access']) ? $diffpath : NULL;
     }
@@ -1137,7 +1137,7 @@ function features_admin_components_revert(&$form, &$form_state) {
     drupal_set_message(t('Please select which components to revert.'), 'warning');
   }
   features_revert($revert);
-  $form_state['redirect'] = 'admin/structure/features/' . $module;
+  $form_state['redirect'] = 'admin/structure/features/manage/' . $module;
 }
 
 /**
@@ -1152,7 +1152,7 @@ function features_admin_components_review(&$form, &$form_state) {
     features_set_signature($module, $component);
     drupal_set_message(t('All <strong>@component</strong> components for <strong>@module</strong> reviewed.', array('@component' => $component, '@module' => $module)));
   }
-  $form_state['redirect'] = 'admin/structure/features/' . $module;
+  $form_state['redirect'] = 'admin/structure/features/manage/' . $module;
 }
 
 /**
diff --git a/features.module b/features.module
index f9efda8..f61f240 100644
--- a/features.module
+++ b/features.module
@@ -85,7 +85,7 @@ function features_menu() {
     'file' => 'features.admin.inc',
     'weight' => 1,
   );
-  $items['admin/structure/features/manage'] = array(
+  $items['admin/structure/features/list'] = array(
     'title' => 'Manage',
     'description' => 'Enable and disable features.',
     'page callback' => 'drupal_get_form',
@@ -105,7 +105,7 @@ function features_menu() {
     'weight' => 10,
   );
 
-  $items['admin/structure/features/%feature'] = array(
+  $items['admin/structure/features/manage/%feature'] = array(
     'title callback' => 'features_get_feature_title',
     'title arguments' => array(3),
     'description' => 'Display components of a feature.',
@@ -117,7 +117,7 @@ function features_menu() {
     'type' => MENU_CALLBACK,
     'file' => 'features.admin.inc',
   );
-  $items['admin/structure/features/%feature/view'] = array(
+  $items['admin/structure/features/manage/%feature/view'] = array(
     'title' => 'View',
     'description' => 'Display components of a feature.',
     'access callback' => 'user_access',
@@ -125,7 +125,7 @@ function features_menu() {
     'type' => MENU_DEFAULT_LOCAL_TASK,
     'weight' => -10,
   );
-  $items['admin/structure/features/%feature/recreate'] = array(
+  $items['admin/structure/features/manage/%feature/recreate'] = array(
     'title' => 'Recreate',
     'description' => 'Recreate an existing feature.',
     'page callback' => 'drupal_get_form',
@@ -138,7 +138,7 @@ function features_menu() {
     'weight' => 11,
   );
   if (module_exists('diff')) {
-    $items['admin/structure/features/%feature/diff'] = array(
+    $items['admin/structure/features/manage/%feature/diff'] = array(
       'title' => 'Review overrides',
       'description' => 'Compare default and current feature.',
       'page callback' => 'features_feature_diff',
@@ -150,7 +150,7 @@ function features_menu() {
       'file' => 'features.admin.inc',
     );
   }
-  $items['admin/structure/features/%feature/status'] = array(
+  $items['admin/structure/features/manage/%feature/status'] = array(
     'title' => 'Status',
     'description' => 'Javascript status call back.',
     'page callback' => 'features_feature_status',