diff --git a/plugins/gunicorn/gunicorn_memory_status b/plugins/gunicorn/gunicorn_memory_status
index 4cdbb58b..630af52e 100755
--- a/plugins/gunicorn/gunicorn_memory_status
+++ b/plugins/gunicorn/gunicorn_memory_status
@@ -86,7 +86,7 @@ def print_config():
     print graph_title
     print "graph_args --base 1024 -l 0"
     print "graph_vlabel Megabytes"
-    print "graph_category gunicorn"
+    print "graph_category appserver"
     print "total_memory.label Total Memory"
 
 if __name__ == "__main__":
diff --git a/plugins/gunicorn/gunicorn_status b/plugins/gunicorn/gunicorn_status
index 78cd48d8..471b291d 100755
--- a/plugins/gunicorn/gunicorn_status
+++ b/plugins/gunicorn/gunicorn_status
@@ -101,7 +101,7 @@ def print_config():
     print graph_title
     print "graph_args -l 0"
     print "graph_vlabel Number of workers"
-    print "graph_category gunicorn"
+    print "graph_category appserver"
     print "total_workers.label Total Workers"
     print "idle_workers.label Idle Workers"
 
diff --git a/plugins/hadoop/hadoop-dfs-plugin b/plugins/hdfs/hadoop-dfs-plugin
similarity index 98%
rename from plugins/hadoop/hadoop-dfs-plugin
rename to plugins/hdfs/hadoop-dfs-plugin
index 5918f5a5..8cb4c7b7 100755
--- a/plugins/hadoop/hadoop-dfs-plugin
+++ b/plugins/hdfs/hadoop-dfs-plugin
@@ -61,7 +61,7 @@ sub printConfig {
 	if ($type eq "block") {
 		print <<EOT;
 graph_title DFS Statistics
-graph_category hadoop
+graph_category fs
 graph_vlabel count
 block.label Under replicated blocks
 corrupt.label Blocks with corrupt replicas
@@ -70,7 +70,7 @@ EOT
 	} elsif ($type eq "capacity") {
 		print <<EOT;
 graph_title DFS Capacity
-graph_category hadoop
+graph_category fs
 graph_vlabel capacity
 configured.label Configured
 present.label Present
diff --git a/plugins/wiki/mediawiki b/plugins/mediawiki/mediawiki
similarity index 100%
rename from plugins/wiki/mediawiki
rename to plugins/mediawiki/mediawiki
diff --git a/plugins/wiki/mediawiki_api b/plugins/mediawiki/mediawiki_api
similarity index 100%
rename from plugins/wiki/mediawiki_api
rename to plugins/mediawiki/mediawiki_api
diff --git a/plugins/wiki/moinoin_pages b/plugins/moinmoin/moinoin_pages
similarity index 100%
rename from plugins/wiki/moinoin_pages
rename to plugins/moinmoin/moinoin_pages
diff --git a/plugins/websphere/webspherelogin b/plugins/websphere/webspherelogin
index a51480fb..e1744c55 100755
--- a/plugins/websphere/webspherelogin
+++ b/plugins/websphere/webspherelogin
@@ -8,7 +8,7 @@ SITEANALYZERLOG="/opt/WebSphere/SiteAnalyzer/sa.log"
 
 if [ "$1" = "config" ]; then
 	echo 'graph_title WebSphere Portal online users' 
-	echo 'graph_category websphere' 
+	echo 'graph_category appserver' 
 #	echo 'graph_order total actual' 
 	echo 'graph_order actual' 
 	echo 'graph_vlabel Users'
diff --git a/plugins/zope/zeomonitor b/plugins/zope/zeomonitor
index 21c1f5fe..a6620d88 100755
--- a/plugins/zope/zeomonitor
+++ b/plugins/zope/zeomonitor
@@ -17,7 +17,7 @@ def config(data):
     print "graph_args -l 0"
     print "graph_vlabel n"
     print "graph_period minute"
-    print "graph_category webserver"
+    print "graph_category appserver"
 
 def get_data():
     import sys