diff --git a/plugins/attacks.py b/disabled_stuff/attacks.py
similarity index 100%
rename from plugins/attacks.py
rename to disabled_stuff/attacks.py
diff --git a/plugins/brainfuck.py b/disabled_stuff/brainfuck.py
similarity index 100%
rename from plugins/brainfuck.py
rename to disabled_stuff/brainfuck.py
diff --git a/plugins/choose.py b/disabled_stuff/choose.py
similarity index 100%
rename from plugins/choose.py
rename to disabled_stuff/choose.py
diff --git a/plugins/coin.py b/disabled_stuff/coin.py
similarity index 100%
rename from plugins/coin.py
rename to disabled_stuff/coin.py
diff --git a/plugins/correction.py b/disabled_stuff/correction.py
similarity index 100%
rename from plugins/correction.py
rename to disabled_stuff/correction.py
diff --git a/plugins/cryptocoins.py b/disabled_stuff/cryptocoins.py
similarity index 100%
rename from plugins/cryptocoins.py
rename to disabled_stuff/cryptocoins.py
diff --git a/plugins/cypher.py b/disabled_stuff/cypher.py
similarity index 100%
rename from plugins/cypher.py
rename to disabled_stuff/cypher.py
diff --git a/plugins/data/8ball_responses.txt b/disabled_stuff/data/8ball_responses.txt
similarity index 100%
rename from plugins/data/8ball_responses.txt
rename to disabled_stuff/data/8ball_responses.txt
diff --git a/disabled_stuff/data/GeoLiteCity.dat b/disabled_stuff/data/GeoLiteCity.dat
new file mode 100644
index 0000000..e94f60e
Binary files /dev/null and b/disabled_stuff/data/GeoLiteCity.dat differ
diff --git a/plugins/data/flirts.txt b/disabled_stuff/data/flirts.txt
similarity index 100%
rename from plugins/data/flirts.txt
rename to disabled_stuff/data/flirts.txt
diff --git a/plugins/data/fortunes.txt b/disabled_stuff/data/fortunes.txt
similarity index 100%
rename from plugins/data/fortunes.txt
rename to disabled_stuff/data/fortunes.txt
diff --git a/plugins/data/geoip_regions.json b/disabled_stuff/data/geoip_regions.json
similarity index 100%
rename from plugins/data/geoip_regions.json
rename to disabled_stuff/data/geoip_regions.json
diff --git a/plugins/data/insults.txt b/disabled_stuff/data/insults.txt
similarity index 100%
rename from plugins/data/insults.txt
rename to disabled_stuff/data/insults.txt
diff --git a/plugins/data/itemids.txt b/disabled_stuff/data/itemids.txt
similarity index 100%
rename from plugins/data/itemids.txt
rename to disabled_stuff/data/itemids.txt
diff --git a/plugins/data/kills.json b/disabled_stuff/data/kills.json
similarity index 100%
rename from plugins/data/kills.json
rename to disabled_stuff/data/kills.json
diff --git a/plugins/data/kills.txt b/disabled_stuff/data/kills.txt
similarity index 100%
rename from plugins/data/kills.txt
rename to disabled_stuff/data/kills.txt
diff --git a/plugins/data/larts.txt b/disabled_stuff/data/larts.txt
similarity index 100%
rename from plugins/data/larts.txt
rename to disabled_stuff/data/larts.txt
diff --git a/plugins/data/name_files/dragons.json b/disabled_stuff/data/name_files/dragons.json
similarity index 100%
rename from plugins/data/name_files/dragons.json
rename to disabled_stuff/data/name_files/dragons.json
diff --git a/plugins/data/name_files/dwarves.json b/disabled_stuff/data/name_files/dwarves.json
similarity index 100%
rename from plugins/data/name_files/dwarves.json
rename to disabled_stuff/data/name_files/dwarves.json
diff --git a/plugins/data/name_files/elves_female.json b/disabled_stuff/data/name_files/elves_female.json
similarity index 100%
rename from plugins/data/name_files/elves_female.json
rename to disabled_stuff/data/name_files/elves_female.json
diff --git a/plugins/data/name_files/elves_male.json b/disabled_stuff/data/name_files/elves_male.json
similarity index 100%
rename from plugins/data/name_files/elves_male.json
rename to disabled_stuff/data/name_files/elves_male.json
diff --git a/plugins/data/name_files/fantasy.json b/disabled_stuff/data/name_files/fantasy.json
similarity index 100%
rename from plugins/data/name_files/fantasy.json
rename to disabled_stuff/data/name_files/fantasy.json
diff --git a/plugins/data/name_files/female.json b/disabled_stuff/data/name_files/female.json
similarity index 100%
rename from plugins/data/name_files/female.json
rename to disabled_stuff/data/name_files/female.json
diff --git a/plugins/data/name_files/general.json b/disabled_stuff/data/name_files/general.json
similarity index 100%
rename from plugins/data/name_files/general.json
rename to disabled_stuff/data/name_files/general.json
diff --git a/plugins/data/name_files/hobbits.json b/disabled_stuff/data/name_files/hobbits.json
similarity index 100%
rename from plugins/data/name_files/hobbits.json
rename to disabled_stuff/data/name_files/hobbits.json
diff --git a/plugins/data/name_files/inns.json b/disabled_stuff/data/name_files/inns.json
similarity index 100%
rename from plugins/data/name_files/inns.json
rename to disabled_stuff/data/name_files/inns.json
diff --git a/plugins/data/name_files/items.json b/disabled_stuff/data/name_files/items.json
similarity index 100%
rename from plugins/data/name_files/items.json
rename to disabled_stuff/data/name_files/items.json
diff --git a/plugins/data/name_files/male.json b/disabled_stuff/data/name_files/male.json
similarity index 100%
rename from plugins/data/name_files/male.json
rename to disabled_stuff/data/name_files/male.json
diff --git a/plugins/data/name_files/narn.json b/disabled_stuff/data/name_files/narn.json
similarity index 100%
rename from plugins/data/name_files/narn.json
rename to disabled_stuff/data/name_files/narn.json
diff --git a/plugins/data/name_files/warrior_cats.json b/disabled_stuff/data/name_files/warrior_cats.json
similarity index 100%
rename from plugins/data/name_files/warrior_cats.json
rename to disabled_stuff/data/name_files/warrior_cats.json
diff --git a/plugins/data/recipes.txt b/disabled_stuff/data/recipes.txt
similarity index 100%
rename from plugins/data/recipes.txt
rename to disabled_stuff/data/recipes.txt
diff --git a/plugins/data/slaps.json b/disabled_stuff/data/slaps.json
similarity index 100%
rename from plugins/data/slaps.json
rename to disabled_stuff/data/slaps.json
diff --git a/plugins/data/slogans.txt b/disabled_stuff/data/slogans.txt
similarity index 100%
rename from plugins/data/slogans.txt
rename to disabled_stuff/data/slogans.txt
diff --git a/plugins/dice.py b/disabled_stuff/dice.py
similarity index 100%
rename from plugins/dice.py
rename to disabled_stuff/dice.py
diff --git a/plugins/dictionary.py b/disabled_stuff/dictionary.py
similarity index 100%
rename from plugins/dictionary.py
rename to disabled_stuff/dictionary.py
diff --git a/plugins/domainr.py b/disabled_stuff/domainr.py
similarity index 100%
rename from plugins/domainr.py
rename to disabled_stuff/domainr.py
diff --git a/plugins/down.py b/disabled_stuff/down.py
similarity index 100%
rename from plugins/down.py
rename to disabled_stuff/down.py
diff --git a/plugins/drama.py b/disabled_stuff/drama.py
similarity index 100%
rename from plugins/drama.py
rename to disabled_stuff/drama.py
diff --git a/plugins/eightball.py b/disabled_stuff/eightball.py
similarity index 100%
rename from plugins/eightball.py
rename to disabled_stuff/eightball.py
diff --git a/plugins/encrypt.py b/disabled_stuff/encrypt.py
similarity index 100%
rename from plugins/encrypt.py
rename to disabled_stuff/encrypt.py
diff --git a/plugins/fact.py b/disabled_stuff/fact.py
similarity index 100%
rename from plugins/fact.py
rename to disabled_stuff/fact.py
diff --git a/plugins/factoids.py b/disabled_stuff/factoids.py
similarity index 100%
rename from plugins/factoids.py
rename to disabled_stuff/factoids.py
diff --git a/plugins/fishbans.py b/disabled_stuff/fishbans.py
similarity index 100%
rename from plugins/fishbans.py
rename to disabled_stuff/fishbans.py
diff --git a/plugins/fmylife.py b/disabled_stuff/fmylife.py
similarity index 100%
rename from plugins/fmylife.py
rename to disabled_stuff/fmylife.py
diff --git a/plugins/fortune.py b/disabled_stuff/fortune.py
similarity index 100%
rename from plugins/fortune.py
rename to disabled_stuff/fortune.py
diff --git a/plugins/geoip.py b/disabled_stuff/geoip.py
similarity index 100%
rename from plugins/geoip.py
rename to disabled_stuff/geoip.py
diff --git a/plugins/github.py b/disabled_stuff/github.py
similarity index 100%
rename from plugins/github.py
rename to disabled_stuff/github.py
diff --git a/plugins/google.py b/disabled_stuff/google.py
similarity index 100%
rename from plugins/google.py
rename to disabled_stuff/google.py
diff --git a/plugins/google_translate.py b/disabled_stuff/google_translate.py
similarity index 100%
rename from plugins/google_translate.py
rename to disabled_stuff/google_translate.py
diff --git a/plugins/googleurlparse.py b/disabled_stuff/googleurlparse.py
similarity index 100%
rename from plugins/googleurlparse.py
rename to disabled_stuff/googleurlparse.py
diff --git a/plugins/history.py b/disabled_stuff/history.py
similarity index 100%
rename from plugins/history.py
rename to disabled_stuff/history.py
diff --git a/plugins/horoscope.py b/disabled_stuff/horoscope.py
similarity index 100%
rename from plugins/horoscope.py
rename to disabled_stuff/horoscope.py
diff --git a/plugins/hulu.py b/disabled_stuff/hulu.py
similarity index 100%
rename from plugins/hulu.py
rename to disabled_stuff/hulu.py
diff --git a/plugins/imdb.py b/disabled_stuff/imdb.py
similarity index 100%
rename from plugins/imdb.py
rename to disabled_stuff/imdb.py
diff --git a/plugins/imgur.py b/disabled_stuff/imgur.py
similarity index 100%
rename from plugins/imgur.py
rename to disabled_stuff/imgur.py
diff --git a/plugins/isup.py b/disabled_stuff/isup.py
similarity index 100%
rename from plugins/isup.py
rename to disabled_stuff/isup.py
diff --git a/plugins/kernel.py b/disabled_stuff/kernel.py
similarity index 100%
rename from plugins/kernel.py
rename to disabled_stuff/kernel.py
diff --git a/plugins/kill.py b/disabled_stuff/kill.py
similarity index 100%
rename from plugins/kill.py
rename to disabled_stuff/kill.py
diff --git a/plugins/lastfm.py b/disabled_stuff/lastfm.py
similarity index 100%
rename from plugins/lastfm.py
rename to disabled_stuff/lastfm.py
diff --git a/plugins/lmgtfy.py b/disabled_stuff/lmgtfy.py
similarity index 100%
rename from plugins/lmgtfy.py
rename to disabled_stuff/lmgtfy.py
diff --git a/plugins/log.py b/disabled_stuff/log.py
similarity index 100%
rename from plugins/log.py
rename to disabled_stuff/log.py
diff --git a/plugins/lyrics.py b/disabled_stuff/lyrics.py
similarity index 100%
rename from plugins/lyrics.py
rename to disabled_stuff/lyrics.py
diff --git a/plugins/metacritic.py b/disabled_stuff/metacritic.py
similarity index 100%
rename from plugins/metacritic.py
rename to disabled_stuff/metacritic.py
diff --git a/plugins/minecraft_bukget.py b/disabled_stuff/minecraft_bukget.py
similarity index 100%
rename from plugins/minecraft_bukget.py
rename to disabled_stuff/minecraft_bukget.py
diff --git a/plugins/minecraft_items.py b/disabled_stuff/minecraft_items.py
similarity index 100%
rename from plugins/minecraft_items.py
rename to disabled_stuff/minecraft_items.py
diff --git a/plugins/minecraft_ping.py b/disabled_stuff/minecraft_ping.py
similarity index 100%
rename from plugins/minecraft_ping.py
rename to disabled_stuff/minecraft_ping.py
diff --git a/plugins/minecraft_status.py b/disabled_stuff/minecraft_status.py
similarity index 100%
rename from plugins/minecraft_status.py
rename to disabled_stuff/minecraft_status.py
diff --git a/plugins/minecraft_user.py b/disabled_stuff/minecraft_user.py
similarity index 100%
rename from plugins/minecraft_user.py
rename to disabled_stuff/minecraft_user.py
diff --git a/plugins/minecraft_wiki.py b/disabled_stuff/minecraft_wiki.py
similarity index 100%
rename from plugins/minecraft_wiki.py
rename to disabled_stuff/minecraft_wiki.py
diff --git a/plugins/mlia.py b/disabled_stuff/mlia.py
similarity index 100%
rename from plugins/mlia.py
rename to disabled_stuff/mlia.py
diff --git a/plugins/namegen.py b/disabled_stuff/namegen.py
similarity index 100%
rename from plugins/namegen.py
rename to disabled_stuff/namegen.py
diff --git a/plugins/newegg.py b/disabled_stuff/newegg.py
similarity index 100%
rename from plugins/newegg.py
rename to disabled_stuff/newegg.py
diff --git a/plugins/newgrounds.py b/disabled_stuff/newgrounds.py
similarity index 100%
rename from plugins/newgrounds.py
rename to disabled_stuff/newgrounds.py
diff --git a/plugins/notes.py b/disabled_stuff/notes.py
similarity index 100%
rename from plugins/notes.py
rename to disabled_stuff/notes.py
diff --git a/plugins/osrc.py b/disabled_stuff/osrc.py
similarity index 100%
rename from plugins/osrc.py
rename to disabled_stuff/osrc.py
diff --git a/plugins/password.py b/disabled_stuff/password.py
similarity index 100%
rename from plugins/password.py
rename to disabled_stuff/password.py
diff --git a/plugins/plpaste.py b/disabled_stuff/plpaste.py
similarity index 100%
rename from plugins/plpaste.py
rename to disabled_stuff/plpaste.py
diff --git a/plugins/potato.py b/disabled_stuff/potato.py
similarity index 100%
rename from plugins/potato.py
rename to disabled_stuff/potato.py
diff --git a/plugins/pre.py b/disabled_stuff/pre.py
similarity index 100%
rename from plugins/pre.py
rename to disabled_stuff/pre.py
diff --git a/plugins/python.py b/disabled_stuff/python.py
similarity index 100%
rename from plugins/python.py
rename to disabled_stuff/python.py
diff --git a/plugins/qrcode.py b/disabled_stuff/qrcode.py
similarity index 100%
rename from plugins/qrcode.py
rename to disabled_stuff/qrcode.py
diff --git a/plugins/quote.py b/disabled_stuff/quote.py
similarity index 100%
rename from plugins/quote.py
rename to disabled_stuff/quote.py
diff --git a/plugins/rdio.py b/disabled_stuff/rdio.py
similarity index 100%
rename from plugins/rdio.py
rename to disabled_stuff/rdio.py
diff --git a/plugins/recipe.py b/disabled_stuff/recipe.py
similarity index 100%
rename from plugins/recipe.py
rename to disabled_stuff/recipe.py
diff --git a/plugins/reddit.py b/disabled_stuff/reddit.py
similarity index 100%
rename from plugins/reddit.py
rename to disabled_stuff/reddit.py
diff --git a/plugins/regex_chans.py b/disabled_stuff/regex_chans.py
similarity index 100%
rename from plugins/regex_chans.py
rename to disabled_stuff/regex_chans.py
diff --git a/plugins/rottentomatoes.py b/disabled_stuff/rottentomatoes.py
similarity index 100%
rename from plugins/rottentomatoes.py
rename to disabled_stuff/rottentomatoes.py
diff --git a/plugins/rss.py b/disabled_stuff/rss.py
similarity index 100%
rename from plugins/rss.py
rename to disabled_stuff/rss.py
diff --git a/plugins/shorten.py b/disabled_stuff/shorten.py
similarity index 100%
rename from plugins/shorten.py
rename to disabled_stuff/shorten.py
diff --git a/plugins/slap.py b/disabled_stuff/slap.py
similarity index 100%
rename from plugins/slap.py
rename to disabled_stuff/slap.py
diff --git a/plugins/slogan.py b/disabled_stuff/slogan.py
similarity index 100%
rename from plugins/slogan.py
rename to disabled_stuff/slogan.py
diff --git a/plugins/snopes.py b/disabled_stuff/snopes.py
similarity index 100%
rename from plugins/snopes.py
rename to disabled_stuff/snopes.py
diff --git a/plugins/soundcloud.py b/disabled_stuff/soundcloud.py
similarity index 100%
rename from plugins/soundcloud.py
rename to disabled_stuff/soundcloud.py
diff --git a/plugins/spellcheck.py b/disabled_stuff/spellcheck.py
similarity index 100%
rename from plugins/spellcheck.py
rename to disabled_stuff/spellcheck.py
diff --git a/plugins/spotify.py b/disabled_stuff/spotify.py
similarity index 100%
rename from plugins/spotify.py
rename to disabled_stuff/spotify.py
diff --git a/plugins/steam.py b/disabled_stuff/steam.py
similarity index 100%
rename from plugins/steam.py
rename to disabled_stuff/steam.py
diff --git a/plugins/steam_calc.py b/disabled_stuff/steam_calc.py
similarity index 100%
rename from plugins/steam_calc.py
rename to disabled_stuff/steam_calc.py
diff --git a/plugins/stock.py b/disabled_stuff/stock.py
similarity index 100%
rename from plugins/stock.py
rename to disabled_stuff/stock.py
diff --git a/plugins/suggest.py b/disabled_stuff/suggest.py
similarity index 100%
rename from plugins/suggest.py
rename to disabled_stuff/suggest.py
diff --git a/plugins/system.py b/disabled_stuff/system.py
similarity index 100%
rename from plugins/system.py
rename to disabled_stuff/system.py
diff --git a/plugins/tell.py b/disabled_stuff/tell.py
similarity index 100%
rename from plugins/tell.py
rename to disabled_stuff/tell.py
diff --git a/plugins/time_plugin.py b/disabled_stuff/time_plugin.py
similarity index 100%
rename from plugins/time_plugin.py
rename to disabled_stuff/time_plugin.py
diff --git a/plugins/title.py b/disabled_stuff/title.py
similarity index 100%
rename from plugins/title.py
rename to disabled_stuff/title.py
diff --git a/plugins/tvdb.py b/disabled_stuff/tvdb.py
similarity index 100%
rename from plugins/tvdb.py
rename to disabled_stuff/tvdb.py
diff --git a/plugins/twitch.py b/disabled_stuff/twitch.py
similarity index 100%
rename from plugins/twitch.py
rename to disabled_stuff/twitch.py
diff --git a/plugins/twitter.py b/disabled_stuff/twitter.py
similarity index 100%
rename from plugins/twitter.py
rename to disabled_stuff/twitter.py
diff --git a/plugins/update.py b/disabled_stuff/update.py
similarity index 100%
rename from plugins/update.py
rename to disabled_stuff/update.py
diff --git a/plugins/urban.py b/disabled_stuff/urban.py
similarity index 100%
rename from plugins/urban.py
rename to disabled_stuff/urban.py
diff --git a/plugins/utility.py b/disabled_stuff/utility.py
similarity index 100%
rename from plugins/utility.py
rename to disabled_stuff/utility.py
diff --git a/plugins/validate.py b/disabled_stuff/validate.py
similarity index 100%
rename from plugins/validate.py
rename to disabled_stuff/validate.py
diff --git a/plugins/valvesounds.py b/disabled_stuff/valvesounds.py
similarity index 100%
rename from plugins/valvesounds.py
rename to disabled_stuff/valvesounds.py
diff --git a/plugins/vimeo.py b/disabled_stuff/vimeo.py
similarity index 100%
rename from plugins/vimeo.py
rename to disabled_stuff/vimeo.py
diff --git a/plugins/weather.py b/disabled_stuff/weather.py
similarity index 100%
rename from plugins/weather.py
rename to disabled_stuff/weather.py
diff --git a/plugins/wikipedia.py b/disabled_stuff/wikipedia.py
similarity index 100%
rename from plugins/wikipedia.py
rename to disabled_stuff/wikipedia.py
diff --git a/plugins/wolframalpha.py b/disabled_stuff/wolframalpha.py
similarity index 100%
rename from plugins/wolframalpha.py
rename to disabled_stuff/wolframalpha.py
diff --git a/plugins/xkcd.py b/disabled_stuff/xkcd.py
similarity index 100%
rename from plugins/xkcd.py
rename to disabled_stuff/xkcd.py
diff --git a/plugins/yahooanswers.py b/disabled_stuff/yahooanswers.py
similarity index 100%
rename from plugins/yahooanswers.py
rename to disabled_stuff/yahooanswers.py
diff --git a/plugins/youtube.py b/disabled_stuff/youtube.py
similarity index 100%
rename from plugins/youtube.py
rename to disabled_stuff/youtube.py
diff --git a/plugins/status.py b/plugins/status.py
deleted file mode 100644
index 0ad6006..0000000
--- a/plugins/status.py
+++ /dev/null
@@ -1,20 +0,0 @@
-from util import hook
-import re
-
-@hook.event("TOPIC")
-def topic_update(info, conn=None, chan=None):
-    """topic_update -- adds status to topic"""
-
-    # retrieve current status
-    status = 'Offen'
-
-    topic = info[1]
-
-    if 'Status' in topic:
-        new_topic = re.sub('Status: \w*', 'Status: {}'.format(status), topic)
-    else:
-        new_topic = topic.rstrip(' |') + ' | Status: {}'.format(status)
-
-    if new_topic != topic:
-        out = "TOPIC {} :{}".format(chan, new_topic)
-        conn.send(out)