diff --git a/celery/celery.rb b/celery_overall/celery_overall.rb
similarity index 80%
rename from celery/celery.rb
rename to celery_overall/celery_overall.rb
index 43f281ba..b7872dec 100644
--- a/celery/celery.rb
+++ b/celery_overall/celery_overall.rb
@@ -1,18 +1,21 @@
 # =================================================================================
-# celery
+# This is a "global view" of your Celery system.  
+# It monitors and reports on how many workers you have running, total task results/state, and task results per minute/second.
 #
 # Created by Erik Wickstrom on 2011-10-14.
 # =================================================================================
 
-class Celery < Scout::Plugin
-  needs 'rubygems'
+class CeleryOverall < Scout::Plugin
   needs 'json'
   needs 'net/http'
 
   OPTIONS=<<-EOS
-    celerymon_url:        default: http://localhost:8989        notes: The base URL of your Celerymon server.    frequency:
-        default: minute
-        notes: The frequency at which sample rates should be calculated (ie "7 failures per minute").  Valid options are minute and second.
+  celerymon_url:        
+    default: http://localhost:8989        
+    notes: The base URL of your Celerymon server.    
+  frequency:
+    default: minute
+    notes: The frequency at which sample rates should be calculated (ie "7 failures per minute").  Valid options are minute and second.
   EOS
 
   def build_report
diff --git a/celery_task_details/celery_task_details.rb b/celery_task_details/celery_task_details.rb
index f7c06f3f..16a81b4a 100644
--- a/celery_task_details/celery_task_details.rb
+++ b/celery_task_details/celery_task_details.rb
@@ -1,20 +1,21 @@
 # =================================================================================
-# celery_task_details
+# This monitors detailed stats on specific celery task types (results/states, average runtime, etc)
 #
 # Created by Erik Wickstrom on 2011-10-14.
 # =================================================================================
 
 class CeleryTaskDetails < Scout::Plugin
-  needs 'rubygems'
   needs 'json'
   needs 'net/http'
-  OPTIONS=<<-EOS    celerymon_url:        default: http://localhost:8989
-        notes: The base URL of your Celerymon server.
-    frequency:
-        default: minute
-        notes: The frequency at which sample rates should be calculated (ie "7 failures per minute").  Valid options are minute and second.
-    task_name:
-        notes: The fully qualified name of the task (ie module.tasks.my_task)
+  OPTIONS=<<-EOS    
+  celerymon_url:        
+    default: http://localhost:8989
+    notes: The base URL of your Celerymon server.
+  frequency:
+    default: minute
+    notes: The frequency at which sample rates should be calculated (ie "7 failures per minute").  Valid options are minute and second.
+  task_name:
+    notes: The fully qualified name of the task (ie module.tasks.my_task)
   EOS
 
   def build_report
diff --git a/celery_task/celery_task.rb b/celery_tasks/celery_tasks.rb
similarity index 84%
rename from celery_task/celery_task.rb
rename to celery_tasks/celery_tasks.rb
index 17e952f3..d3f9b8d1 100644
--- a/celery_task/celery_task.rb
+++ b/celery_tasks/celery_tasks.rb
@@ -1,18 +1,20 @@
 # =================================================================================
-# celery_tasks
+# This monitors throughput of your 20 most active celery tasks.
 #
 # Created by Erik Wickstrom on 2011-10-14.
 # =================================================================================
 
 class CeleryTasks < Scout::Plugin
-  needs 'rubygems'
   needs 'json'
   needs 'net/http'
 
   OPTIONS=<<-EOS
-    celerymon_url:
-        default: http://localhost:8989        notes: The base URL of your Celerymon server.    frequency:        default: minute
-        notes: The frequency at which sample rates should be calculated (ie "7 failures per minute").  Valid options are minute and second.
+  celerymon_url:
+    default: http://localhost:8989        
+    notes: The base URL of your Celerymon server.    
+  frequency:        
+    default: minute
+    notes: The frequency at which sample rates should be calculated (ie "7 failures per minute").  Valid options are minute and second.
   EOS
 
   def build_report