diff --git a/modules/js/js.js b/modules/js/js.js
index 3ac75e4..83e1bf0 100644
--- a/modules/js/js.js
+++ b/modules/js/js.js
@@ -32,8 +32,6 @@ var js = function(dbot) {
     };
     commands['~js'].regex = [/^~js (.*)/, 2];
     commands['~ajs'].regex = [/^~ajs (.*)/, 2];
-    commands['~js'].usage = '~js [command]';
-    commands['~ajs'].usage = '~ajs [command]';
 
     return {
         'name': 'js',
diff --git a/modules/js/usage.json b/modules/js/usage.json
new file mode 100644
index 0000000..a6deb48
--- /dev/null
+++ b/modules/js/usage.json
@@ -0,0 +1,4 @@
+{
+    '~js': '~js [command]',
+    '~ajs': '~ajs [command]'
+}
diff --git a/modules/poll/poll.js b/modules/poll/poll.js
index 2b82282..a2a6223 100644
--- a/modules/poll/poll.js
+++ b/modules/poll/poll.js
@@ -214,13 +214,7 @@ var poll = function(dbot) {
     commands['~vote'].regex = [/~vote ([^ ]+) ([^ ]+)/, 3];
     commands['~pdesc'].regex = [/~pdesc ([^ ]+)/, 2];
     commands['~count'].regex = [/~count ([^ ]+)/, 2];
-
-    commands['~newpoll'].usage = '~newpoll [pollname] options=[each,poll,option] [Poll Description]';
-    commands['~addoption'].usage = '~addoption [pollname] [newoption]';
-    commands['~rmoption'].usage= '~rmoption [pollname] [optiontoremove]';
-    commands['~vote'].usage= '~vote [pollname] [option]';
-    commands['~pdesc'].usage = '~pdesc [pollname]';
-
+    
     return {
         'name': 'poll',
         'ignorable': true,
diff --git a/modules/poll/usage.json b/modules/poll/usage.json
new file mode 100644
index 0000000..3fe17f5
--- /dev/null
+++ b/modules/poll/usage.json
@@ -0,0 +1,7 @@
+{
+    '~newpoll': '~newpoll [pollname] options=[each,poll,option] [Poll Description]',
+    '~addoption': '~addoption [pollname] [newoption]',
+    '~rmoption': '~rmoption [pollname] [optiontoremove]',
+    '~vote': '~vote [pollname] [option]',
+    '~pdesc': '~pdesc [pollname]'
+}
diff --git a/modules/quotes/quotes.js b/modules/quotes/quotes.js
index 479a9f2..582f4e8 100644
--- a/modules/quotes/quotes.js
+++ b/modules/quotes/quotes.js
@@ -202,12 +202,6 @@ var quotes = function(dbot) {
     commands['~rmlast'].regex = [/^~rmlast ([\d\w\s-]*)/, 2];
     commands['~qadd'].regex = [/^~qadd ([\d\w\s-]+?)[ ]?=[ ]?(.+)$/, 3];
 
-    commands['~q'].usage = '~q [category]';
-    commands['~qsearch'].usage = '~qsearch [category]=[search]';
-    commands['~rm'].usage = '~rm [category]=[quote to delete]';
-    commands['~rmlast'].usage = '~rmlast [category]'
-    commands['~qadd'].usage = '~qadd [category]=[content]';
-
     return {
         'name': 'quotes',
         'ignorable': true,
diff --git a/modules/quotes/usage.json b/modules/quotes/usage.json
new file mode 100644
index 0000000..4bd9dbc
--- /dev/null
+++ b/modules/quotes/usage.json
@@ -0,0 +1,7 @@
+{
+    '~q': '~q [category]',
+    '~qsearch': '~qsearch [category]=[search]',
+    '~rm': '~rm [category]=[quote to delete]',
+    '~rmlast': '~rmlast [category],
+    '~qadd': '~qadd [category]=[content]'
+}
diff --git a/modules/report/report.js b/modules/report/report.js
index f3f4c2f..1e6f03d 100644
--- a/modules/report/report.js
+++ b/modules/report/report.js
@@ -38,7 +38,6 @@ var report = function(dbot) {
 
     };
     commands['~report'].regex = [/^~report ([^ ]+) ([^ ]+) (.+)$/, 4];
-    commands['~report'].usage = '~report [#channel] [username] [reason for reporting]';
 
     return {
         'name': 'report',
diff --git a/modules/report/usage.json b/modules/report/usage.json
new file mode 100644
index 0000000..153ca23
--- /dev/null
+++ b/modules/report/usage.json
@@ -0,0 +1,3 @@
+{
+    '~report': '~report [#channel] [username] [reason for reporting]'
+}