diff --git a/mhapi/web/fcgi.py b/bin/fcgi_server.py
similarity index 100%
rename from mhapi/web/fcgi.py
rename to bin/fcgi_server.py
diff --git a/bin/mhprob.py b/bin/mhprob.py
new file mode 100755
index 0000000..1b62793
--- /dev/null
+++ b/bin/mhprob.py
@@ -0,0 +1,98 @@
+#!/usr/bin/env python
+
+"""
+Calculate probability of getting at least one of a monster part from one
+line in the quest rewards. Also calculates expected value of part
+counts (N), and probabilities of getting a certain number of rewards (C).
+
+usage: mhprob.py reward_percent fixed_rewards gaurenteed_rewards \
+                 [extend_percent]
+
+reward_percent - chance of getting the monster part in %
+fixed_rewards - number of rewards in the reward list with 100% chance and
+                are not the item you are looking for. Takes away from
+                the total possible draw attempts for what you want.
+                Default 1 which is typical for line A in many quests.
+gaurenteed_rewards - minimum number of quest rewards in the line,
+                     including any fixed rewards. In Tri (see link
+                     below) this is 3 for line A and 1 for line B.
+                     Defaults to 3.
+extend_percent - chance of getting one more reward in the line in %,
+                 default 69
+
+You can use http://kiranico.com to get reward percent and fixed rewards
+values.
+
+For extend percent, use the default unless you have the Lucky Cat or
+Ultra Lucky Cat food skills or Good Luck or Great Luck armor skills:
+
+normal extra reward %: 69
+good luck extra reward %: 81
+great luck extra %: 90
+
+Can also be used to calculate chance of getting a part from carving,
+using extend_percent=0, fixed_rewards=0, and gaurenteed_rewards=3 (or
+4 for monsters with 4 carves).
+
+Source:
+http://www.gamefaqs.com/wii/943655-monster-hunter-tri/faqs/60448
+Not sure if there are differences in 3U or 4U.
+
+Example Plain dangerous in 3U, has 2 fixed rewards in A, one in B, hardhorns
+are 5% both A and B:
+A: ./mhprop.py 5 2 3 69
+B: ./mhprop.py 5 1 1 69
+For great luck, replace 69 with 90
+"""
+
+import sys
+
+from mhapi import stats
+
+if __name__ == '__main__':
+    # in percent
+    reward_percent = int(sys.argv[1])
+    if len(sys.argv) > 2:
+        fixed_rewards = int(sys.argv[2])
+    else:
+        fixed_rewards = 1
+    if len(sys.argv) > 3:
+        guarenteed_rewards = int(sys.argv[3])
+    else:
+        guarenteed_rewards = 3
+    if len(sys.argv) > 4:
+        extend_percent = int(sys.argv[4])
+    else:
+        extend_percent = 69
+
+    min_rewards = guarenteed_rewards - fixed_rewards
+    max_rewards = 8 - fixed_rewards
+
+    if min_rewards < 0:
+        print "Error: fixed_rewards (%d) must be less than or equal to " \
+              "guaranteeed_rewards (%d)" % (fixed_rewards, guarenteed_rewards)
+        sys.exit(1)
+
+    total_p = 0.0
+    expected_attempts = 0.0
+    for reward_count in xrange(min_rewards, max_rewards + 1):
+        p = stats._reward_count_p(reward_count, min_rewards, max_rewards,
+                                  extend_percent)
+        expected_attempts += p * reward_count
+        # probability of getting @reward_count rewards that could be the
+        # desired item
+        print "P(C = %d) = %0.4f" % (reward_count, p)
+        total_p += p
+    # expected value for number of rewards that could be the desired item
+    print "E(C)     = %0.2f" % expected_attempts
+
+    # math check, make sure all possibilities add up to 1, allowing for
+    # some floating point precision loss.
+    assert abs(total_p - 1.0) < .00001, "total = %f" % total_p
+
+    p_at_least_one = stats.quest_reward_p(reward_percent, min_rewards,
+                                          max_rewards, extend_percent)
+    expected = expected_attempts * reward_percent / 100.0
+
+    print "P(N > 0) = %0.2f%%" % p_at_least_one
+    print "E(N)     = %0.4f" % expected
diff --git a/bin/mhrewards.py b/bin/mhrewards.py
new file mode 100755
index 0000000..bb6fb84
--- /dev/null
+++ b/bin/mhrewards.py
@@ -0,0 +1,35 @@
+#!/usr/bin/env python
+
+import codecs
+
+from mhapi.db import MHDB
+from mhapi import rewards
+
+
+def get_utf8_writer(writer):
+    return codecs.getwriter("utf8")(writer)
+
+
+if __name__ == '__main__':
+    import sys
+    import os
+    import os.path
+
+    if len(sys.argv) != 2:
+        print("Usage: %s 'item name'" % sys.argv[0])
+        sys.exit(os.EX_USAGE)
+
+    item_name = sys.argv[1]
+
+    out = get_utf8_writer(sys.stdout)
+    err_out = get_utf8_writer(sys.stderr)
+
+    # TODO: doesn't work if script is symlinked
+    db_path = os.path.dirname(sys.argv[0])
+    db_path = os.path.join(db_path, "..", "db", "mh4u.db")
+    db = MHDB(db_path)
+
+    item_row = rewards.find_item(db, item_name, err_out)
+    if item_row is None:
+        sys.exit(os.EX_DATAERR)
+    rewards.print_quests_and_rewards(db, item_row, out)
diff --git a/bin/test_server.py b/bin/test_server.py
new file mode 100755
index 0000000..3aa0569
--- /dev/null
+++ b/bin/test_server.py
@@ -0,0 +1,16 @@
+#!/usr/bin/env python
+
+from mhapi.web.wsgi import application
+
+LISTEN_HOST = ""
+LISTEN_PORT = 8080
+
+if __name__ == '__main__':
+    import sys
+
+    from wsgiref.simple_server import make_server
+    httpd = make_server(LISTEN_HOST, LISTEN_PORT, application)
+    try:
+        httpd.serve_forever()
+    except KeyboardInterrupt:
+        print "^C"
diff --git a/mhapi/db.py b/mhapi/db.py
old mode 100755
new mode 100644
diff --git a/mhapi/rewards.py b/mhapi/rewards.py
old mode 100755
new mode 100644
index 6429c9e..acc9c00
--- a/mhapi/rewards.py
+++ b/mhapi/rewards.py
@@ -1,7 +1,9 @@
-#!/usr/bin/env python
+"""
+Calculate expected values for monster hunter items and find the best quests
+and hunts for getting an item with specified skills.
+"""
 
 from __future__ import print_function
-import codecs
 
 from mhapi.db import MHDB
 from mhapi import stats
@@ -15,10 +17,6 @@ STRAT_CAP = "cap"
 STRAT_SHINY = "shiny"
 
 
-def get_utf8_writer(writer):
-    return codecs.getwriter("utf8")(writer)
-
-
 def _format_range(min_v, max_v):
     if min_v == max_v:
         return "%5.2f" % min_v
@@ -389,27 +387,3 @@ def print_quests_and_rewards(db, item_row, out):
                 out.write("  %20s %5.2f / 100\n" % ("Shiny", shiny_ev))
             out.write("\n")
 
-
-if __name__ == '__main__':
-    import sys
-    import os
-    import os.path
-
-    if len(sys.argv) != 2:
-        print("Usage: %s 'item name'" % sys.argv[0])
-        sys.exit(os.EX_USAGE)
-
-    item_name = sys.argv[1]
-
-    out = get_utf8_writer(sys.stdout)
-    err_out = get_utf8_writer(sys.stderr)
-
-    # TODO: doesn't work if script is symlinked
-    db_path = os.path.dirname(sys.argv[0])
-    db_path = os.path.join(db_path, "..", "db", "mh4u.db")
-    db = MHDB(db_path)
-
-    item_row = find_item(db, item_name, err_out)
-    if item_row is None:
-        sys.exit(os.EX_DATAERR)
-    print_quests_and_rewards(db, item_row, out)
diff --git a/mhapi/stats.py b/mhapi/stats.py
old mode 100755
new mode 100644
index 06ce57b..ddd3cf0
--- a/mhapi/stats.py
+++ b/mhapi/stats.py
@@ -1,47 +1,6 @@
-#!/usr/bin/env python
-
-# Calculate probability of getting at least one of a monster part from one
-# line in the quest rewards. Also calculates expected value of part
-# counts (N), and probabilities of getting a certain number of rewards (C).
-#
-# usage: mhprob.py reward_percent fixed_rewards gaurenteed_rewards \
-#                  [extend_percent]
-#
-# reward_percent - chance of getting the monster part in %
-# fixed_rewards - number of rewards in the reward list with 100% chance and
-#                 are not the item you are looking for. Takes away from
-#                 the total possible draw attempts for what you want.
-#                 Default 1 which is typical for line A in many quests.
-# gaurenteed_rewards - minimum number of quest rewards in the line,
-#                      including any fixed rewards. In Tri (see link
-#                      below) this is 3 for line A and 1 for line B.
-#                      Defaults to 3.
-# extend_percent - chance of getting one more reward in the line in %,
-#                  default 69
-#
-# You can use http://kiranico.com to get reward percent and fixed rewards
-# values.
-#
-# For extend percent, use the default unless you have the Lucky Cat or
-# Ultra Lucky Cat food skills or Good Luck or Great Luck armor skills:
-#
-# normal extra reward %: 69
-# good luck extra reward %: 81
-# great luck extra %: 90
-#
-# Can also be used to calculate chance of getting a part from carving,
-# using extend_percent=0, fixed_rewards=0, and gaurenteed_rewards=3 (or
-# 4 for monsters with 4 carves).
-#
-# Source:
-# http://www.gamefaqs.com/wii/943655-monster-hunter-tri/faqs/60448
-# Not sure if there are differences in 3U or 4U.
-#
-# Example Plain dangerous in 3U, has 2 fixed rewards in A, one in B, hardhorns
-# are 5% both A and B:
-# A: ./mhprop.py 5 2 3 69
-# B: ./mhprop.py 5 1 1 69
-# For great luck, replace 69 with 90
+"""
+Utility functions for calculating monster hunter related statistics.
+"""
 
 CAP_SKILL_NONE = 0
 CAP_SKILL_EXPERT = 1
@@ -64,8 +23,6 @@ CARVING_SKILL_CELEBRITY = 3
 CARVING_SKILL_GOD = 4
 
 
-import sys
-
 def _quest_reward_p(reward_percent, reward_count):
     """
     Propability of getting at least one item from @reward_count draws
@@ -211,51 +168,3 @@ def carve_delta_expected_c(carve_skill):
         raise ValueError()
     return reward_expected_c(min_c, max_c, extend_p)
 
-
-if __name__ == '__main__':
-    # in percent
-    reward_percent = int(sys.argv[1])
-    if len(sys.argv) > 2:
-        fixed_rewards = int(sys.argv[2])
-    else:
-        fixed_rewards = 1
-    if len(sys.argv) > 3:
-        guarenteed_rewards = int(sys.argv[3])
-    else:
-        guarenteed_rewards = 3
-    if len(sys.argv) > 4:
-        extend_percent = int(sys.argv[4])
-    else:
-        extend_percent = 69
-
-    min_rewards = guarenteed_rewards - fixed_rewards
-    max_rewards = 8 - fixed_rewards
-
-    if min_rewards < 0:
-        print "Error: fixed_rewards (%d) must be less than or equal to " \
-              "guaranteeed_rewards (%d)" % (fixed_rewards, guarenteed_rewards)
-        sys.exit(1)
-
-    total_p = 0.0
-    expected_attempts = 0.0
-    for reward_count in xrange(min_rewards, max_rewards + 1):
-        p = _reward_count_p(reward_count, min_rewards, max_rewards,
-                            extend_percent)
-        expected_attempts += p * reward_count
-        # probability of getting @reward_count rewards that could be the
-        # desired item
-        print "P(C = %d) = %0.4f" % (reward_count, p)
-        total_p += p
-    # expected value for number of rewards that could be the desired item
-    print "E(C)     = %0.2f" % expected_attempts
-
-    # math check, make sure all possibilities add up to 1, allowing for
-    # some floating point precision loss.
-    assert abs(total_p - 1.0) < .00001, "total = %f" % total_p
-
-    p_at_least_one = quest_reward_p(reward_percent, min_rewards, max_rewards,
-                                    extend_percent)
-    expected = expected_attempts * reward_percent / 100.0
-
-    print "P(N > 0) = %0.2f%%" % p_at_least_one
-    print "E(N)     = %0.4f" % expected
diff --git a/mhapi/web/wsgi.py b/mhapi/web/wsgi.py
old mode 100755
new mode 100644
index 1693b80..0ff0576
--- a/mhapi/web/wsgi.py
+++ b/mhapi/web/wsgi.py
@@ -112,11 +112,3 @@ class App(object):
 
 application = App()
 
-
-if __name__ == '__main__':
-    from wsgiref.simple_server import make_server
-    httpd = make_server("", 8080, application)
-    try:
-        httpd.serve_forever()
-    except KeyboardInterrupt:
-        print "^C"