--- og_aggregator.module	2007-06-26 10:22:00.000000000 -0400
+++ og_aggregator.module	2007-10-06 04:05:08.000000000 -0400
@@ -28,19 +28,19 @@
   global $user;
   $items = array();
   if ($may_cache) {
-    $items[] = array('path' => 'admin/og_aggregator',
-      'title' => t('og_aggregator'),
+    $items[] = array('path' => 'admin/og/og_aggregator',
+      'title' => t('OG Aggregator'),
       'callback' => 'og_aggregator_admin_overview');
-    $items[] = array('path' => 'admin/og_aggregator/remove',
+    $items[] = array('path' => 'admin/og/og_aggregator/remove',
       'title' => t('remove items'),
       'callback' => 'og_aggregator_admin_remove_feed',
       'type' => MENU_CALLBACK);
-    $items[] = array('path' => 'admin/og_aggregator/update',
+    $items[] = array('path' => 'admin/og/og_aggregator/update',
       'title' => t('update items'),
       'callback' => 'og_aggregator_admin_refresh_feed',
       'type' => MENU_CALLBACK);
-    $items[] = array('path' => 'admin/og_aggregator/list',
-      'title' => t('list'),
+    $items[] = array('path' => 'admin/og/og_aggregator/list',
+      'title' => t('List'),
       'type' => MENU_DEFAULT_LOCAL_TASK,
       'weight' => -10);
     $items[] = array('path' => 'og_aggregator/sources',
@@ -54,7 +54,7 @@
       if (arg(3) == 'feed') {
         $feed = og_aggregator_get_feed(arg(4));
         if ($feed) {
-          $items[] = array('path' => 'admin/og_aggregator/edit/feed/'. $feed['fid'],
+          $items[] = array('path' => 'admin/og/og_aggregator/edit/feed/'. $feed['fid'],
             'title' => t('edit feed'),
             'callback' => 'og_aggregator_edit_feed',
             'callback arguments' => array($feed,null),
@@ -67,34 +67,38 @@
       $node = node_load(arg(1));
       if (og_is_group_type($node->type)) {
         $items[] = array('path' => 'node/'. arg(1). '/aggregator',
-        	  'title' => t('aggregator'), 
-			  'callback' => 'og_aggregator_page',
-        	  'callback arguments' => array(arg(1)), 'access' =>TRUE,
+            'title' => t('News feeds'), 
+            'callback' => 'og_aggregator_page',
+            'callback arguments' => array(arg(1)), 'access' =>TRUE,
+            'type' => MENU_LOCAL_TASK,
+            );
+        $items[] = array('path' => 'node/'. arg(1). '/aggregator/overview',
+        	  'title' => t('Overview'), 
         	  'type' => MENU_LOCAL_TASK,
-        	  'weight' => 7);
-        $items[] = array('path' => 'node/'. arg(1). '/feed',
-            'title' => t('Feed overview'),
+        	  'weight' => 17);
+        $items[] = array('path' => 'node/'. arg(1). '/aggregator/feed',
+            'title' => t('Feed admin'),
             'callback' => 'og_aggregator_overview',
             'callback arguments' => array(arg(1)),
             'access' => node_access('update', $node),
-            'type' => MENU_LOCAL_TASK, 'weight' => 8); 
-        $items[] = array('path' => 'node/'. arg(1). '/add/feed',
-            'title' => t('add feed'),
+            'type' => MENU_LOCAL_TASK, 'weight' => 18); 
+        $items[] = array('path' => 'node/'. arg(1). '/aggregator/add',
+            'title' => t('Add feed'),
             'callback' => 'og_aggregator_add_feed',
             'callback arguments' => array(null,arg(1)),
             'access' => node_access('update', $node),
-            'type' => MENU_LOCAL_TASK, 'weight' => 9);
-        $items[] = array('path' => 'node/'. arg(1). '/feed/remove',
+            'type' => MENU_LOCAL_TASK, 'weight' => 19);
+        $items[] = array('path' => 'node/'. arg(1). '/aggregator/feed/remove',
 			'title' => t('remove items'),
 			'callback' => 'og_aggregator_remove_feed',
 			'access' => node_access('update', $node),
 			'type' => MENU_CALLBACK);
-		$items[] = array('path' => 'node/'. arg(1). '/feed/update',
+		$items[] = array('path' => 'node/'. arg(1). '/aggregator/feed/update',
 			'title' => t('update items'),
 			'callback' => 'og_aggregator_refresh_feed',
 			'access' => node_access('update', $node),
 			'type' => MENU_CALLBACK);
-		$items[] = array('path' => 'node/'. arg(1). '/feed/edit',
+		$items[] = array('path' => 'node/'. arg(1). '/aggregator/feed/edit',
 			'title' => t('edit feed'),
 			'callback' => 'og_aggregator_edit_feed',
 			'callback arguments' => array(arg(4),arg(1)),
@@ -253,20 +257,20 @@
     if (isset($form_values['title'])) {
       drupal_set_message(t('The feed %feed has been updated.', array('%feed' => theme('placeholder', $form_values['title']))));
       if (arg(0) == 'admin') {
-        return 'admin/og_aggregator/';
+        return 'admin/og/og_aggregator/';
       }
       else {
-		return 'node/'.$form_values['og_id'].'/feed';
+		return 'node/'.$form_values['og_id'].'/aggregator/feed';
       }
     }
     else {
       watchdog('og_aggregator', t('Feed %feed deleted.', array('%feed' => theme('placeholder', $title))));
       drupal_set_message(t('The feed %feed has been deleted.', array('%feed' => theme('placeholder', $title))));
       if (arg(0) == 'admin') {
-        return 'admin/og_aggregator/';
+        return 'admin/og/og_aggregator/';
       }
       else {
-        return 'node/'.$form_values['og_id'].'/feed';
+        return 'node/'.$form_values['og_id'].'/aggregator/feed';
       }
     }
   }
@@ -314,7 +318,7 @@
   $header = array(t('Title'), t('Items'), t('Last update'), t('Next update'), array('data' => t('Operations'), 'colspan' => '3'));
   $rows = array();
   while ($feed = db_fetch_object($result)) {
-    $rows[] = array($feed->title, format_plural($feed->items, '1 item', '@count items'), ($feed->checked ? t('%time ago', array('%time' => format_interval(time() - $feed->checked))) : t('never')), ($feed->checked ? t('%time left', array('%time' => format_interval($feed->checked + $feed->refresh - time()))) : t('never')), l(t('edit'), "node/$feed->nid/feed/edit/$feed->fid"), l(t('remove items'), "node/$feed->nid/feed/remove/$feed->fid"), l(t('update items'), "node/$feed->nid/feed/update/$feed->fid"));
+    $rows[] = array($feed->title, format_plural($feed->items, '1 item', '@count items'), ($feed->checked ? t('%time ago', array('%time' => format_interval(time() - $feed->checked))) : t('never')), ($feed->checked ? t('%time left', array('%time' => format_interval($feed->checked + $feed->refresh - time()))) : t('never')), l(t('edit'), "node/$feed->nid/aggregator/feed/edit/$feed->fid"), l(t('remove items'), "node/$feed->nid/aggregator/feed/remove/$feed->fid"), l(t('update items'), "node/$feed->nid/aggregator/feed/update/$feed->fid"));
   }
   $output .= theme('table', $header, $rows);
 
@@ -336,7 +340,7 @@
   $header = array(t('Group'),t('Title'), t('Items'), t('Last update'), t('Next update'), array('data' => t('Operations'), 'colspan' => '3'));
   $rows = array();
   while ($feed = db_fetch_object($result)) {
-    $rows[] = array(l($feed->og_title, "node/$feed->nid"),$feed->title, format_plural($feed->items, '1 item', '@count items'), ($feed->checked ? t('%time ago', array('%time' => format_interval(time() - $feed->checked))) : t('never')), ($feed->checked ? t('%time left', array('%time' => format_interval($feed->checked + $feed->refresh - time()))) : t('never')), l(t('edit'), "admin/og_aggregator/edit/feed/$feed->fid"), l(t('remove items'), "admin/og_aggregator/remove/$feed->fid"), l(t('update items'), "admin/og_aggregator/update/$feed->fid"));
+    $rows[] = array(l($feed->og_title, "node/aggregator/$feed->nid"),$feed->title, format_plural($feed->items, '1 item', '@count items'), ($feed->checked ? t('%time ago', array('%time' => format_interval(time() - $feed->checked))) : t('never')), ($feed->checked ? t('%time left', array('%time' => format_interval($feed->checked + $feed->refresh - time()))) : t('never')), l(t('edit'), "admin/og/og_aggregator/edit/feed/$feed->fid"), l(t('remove items'), "admin/og/og_aggregator/remove/$feed->fid"), l(t('update items'), "admin/og/og_aggregator/update/$feed->fid"));
   }
   $output .= theme('table', $header, $rows);
 
@@ -348,13 +352,13 @@
  */
 function og_aggregator_admin_remove_feed($feed) {
   og_aggregator_remove(og_aggregator_get_feed($feed));
-  drupal_goto('admin/og_aggregator');
+  drupal_goto('admin/og/og_aggregator');
 }
 
 function og_aggregator_remove_feed($feed) {
   $feed = og_aggregator_get_feed($feed);
   og_aggregator_remove($feed);
-  drupal_goto('node/'.$feed['nid'].'/feed');
+  drupal_goto('node/'.$feed['nid'].'/aggregator/feed');
 }
 
 function og_aggregator_remove($feed) {
@@ -368,13 +372,13 @@
  */
 function og_aggregator_admin_refresh_feed($feed) {
   og_aggregator_refresh(og_aggregator_get_feed($feed));
-  drupal_goto('admin/og_aggregator');
+  drupal_goto('admin/og/og_aggregator');
 }
 
 function og_aggregator_refresh_feed($feed) {
   $feed = og_aggregator_get_feed($feed);
   og_aggregator_refresh($feed);
-  drupal_goto('node/'.$feed['nid'].'/feed');
+  drupal_goto('node/'.$feed['nid'].'/aggregator/feed');
 }
 
 /**
@@ -784,5 +788,4 @@
   $output .= "</div>\n";
 
   return $output;
-}
-?>
+}
\ No newline at end of file