diff -up ../family/EstimateDates.inc ../sandbox/family_new/EstimateDates.inc
--- ../family/EstimateDates.inc	2006-04-30 17:59:21.000000000 -0700
+++ ../sandbox/family_new/EstimateDates.inc	2007-10-02 19:37:07.000000000 -0700
@@ -12,7 +12,7 @@ function family_auto_privacy() {
               "If you have sensitive data, please check manually that the data is set as private. ".
               "You should be aware that any database may be hacked and there is no guarantee for your data security</p>".
               "<p>For large files this may take a few minutes.</p>".
-              "<p><a href=\"/admin/family/privacy_done\">Start auto privacy</a></p>";
+              "<p><a href=\"/admin/settings/family_privacy_done\">Start auto privacy</a></p>";
   return $content;
 }
 
Only in ../family: family_admin_settings_v1-2.patch
diff -up ../family/family.module ../sandbox/family_new/family.module
--- ../family/family.module	2006-04-30 18:04:29.000000000 -0700
+++ ../sandbox/family_new/family.module	2007-10-02 19:37:09.000000000 -0700
@@ -36,32 +36,28 @@ function family_menu($may_cache) {
     'access' => user_access('access family'),
   );
   $items[] = array(
-    'path' => 'admin/family',
-    'title' => t('Family'),
-    'type' => MENU_ITEM_GROUPING,
-    'access' => user_access('administer family'),
-  );
-  $items[] = array(
-    'path' => 'admin/family/import',
-    'title' => t('Import'),
+    'path' => 'admin/content/family_import',
+    'title' => t('Family Import'),
+	'description' => 'Import your family tree from a standard GED file.',
     'callback' => 'family_import',
     'access' => user_access('administer family'),
   );
   $items[] = array(
-    'path' => 'admin/family/privacy',
-    'title' => t('Set Auto Privacy'),
+    'path' => 'admin/settings/family_privacy',
+    'title' => t('Family Auto Privacy'),
+	'description' => 'Protect living relatives with auto privacy.',
     'callback' => 'family_auto_privacy',
     'access' => user_access('administer family'),
   );
   $items[] = array(
-    'path' => 'admin/family/privacy_done',
+    'path' => 'admin/settings/family_privacy_done',
     'title' => t('Auto Privacy Done'),
     'callback' => 'family_auto_privacy_done',
     'type' => MENU_CALLBACK,
     'access' => user_access('administer family'),
   );
   $items[] = array(
-    'path' => 'admin/family/import_done',
+    'path' => 'admin/content/family_import_done',
     'title' => t('Import Done'),
     'callback' => 'family_import_done',
     'type' => MENU_CALLBACK,
diff -up ../family/import.inc ../sandbox/family_new/import.inc
--- ../family/import.inc	2007-10-02 20:35:46.000000000 -0700
+++ ../sandbox/family_new/import.inc	2007-10-02 20:18:20.000000000 -0700
@@ -13,7 +13,7 @@ ini_set('auto_detect_line_endings', true
 function family_import() {
   $content = '<p><strong>Caution: this will delete any current content from family '.
               'database</strong><br><form enctype="multipart/form-data"'.
-              'action="/admin/family/import_done" method="POST">'.
+              'action="/admin/content/family_import_done" method="POST">'.
               '<input type="hidden" name="MAX_FILE_SIZE" value="100000" >'.
               'Choose a file to upload: <input name="gedcom_file" type="file"><br>'.
               '<input type="submit" value="Upload File"></form></p>';
@@ -22,7 +22,8 @@ function family_import() {
 
 // Parse the uploaded GEDCOM file
 function family_import_done() {
-  $content="<p>";
+  $content="<p align=\"center\"><a href=\"/family\">Proceed to your family tree.</a></p>".
+		   "<p>";
   $fp = fopen( $_FILES['gedcom_file']['tmp_name'] , "r" );
   if (!$fp) {
     return "<p>Couldn't open the data file.</p>";