diff --git a/bots/__init__.py b/bots/__init__.py
deleted file mode 100644
index e69de29..0000000
diff --git a/README b/humbug/README
similarity index 100%
rename from README
rename to humbug/README
diff --git a/humbug.py b/humbug/__init__.py
similarity index 100%
rename from humbug.py
rename to humbug/__init__.py
diff --git a/bin/humbug-send b/humbug/bin/humbug-send
similarity index 100%
rename from bin/humbug-send
rename to humbug/bin/humbug-send
diff --git a/__init__.py b/humbug/bots/__init__.py
similarity index 100%
rename from __init__.py
rename to humbug/bots/__init__.py
diff --git a/bots/check-mirroring b/humbug/bots/check-mirroring
similarity index 100%
rename from bots/check-mirroring
rename to humbug/bots/check-mirroring
diff --git a/bots/feedback-bot b/humbug/bots/feedback-bot
similarity index 100%
rename from bots/feedback-bot
rename to humbug/bots/feedback-bot
diff --git a/bots/gcal-bot b/humbug/bots/gcal-bot
similarity index 100%
rename from bots/gcal-bot
rename to humbug/bots/gcal-bot
diff --git a/bots/humbug_trac.py b/humbug/bots/humbug_trac.py
similarity index 100%
rename from bots/humbug_trac.py
rename to humbug/bots/humbug_trac.py
diff --git a/bots/send-nagios-notification b/humbug/bots/send-nagios-notification
similarity index 100%
rename from bots/send-nagios-notification
rename to humbug/bots/send-nagios-notification
diff --git a/bots/tddium-notify-humbug b/humbug/bots/tddium-notify-humbug
similarity index 100%
rename from bots/tddium-notify-humbug
rename to humbug/bots/tddium-notify-humbug
diff --git a/bots/zephyr-mirror-crontab b/humbug/bots/zephyr-mirror-crontab
similarity index 100%
rename from bots/zephyr-mirror-crontab
rename to humbug/bots/zephyr-mirror-crontab
diff --git a/bots/zephyr_mirror.py b/humbug/bots/zephyr_mirror.py
similarity index 100%
rename from bots/zephyr_mirror.py
rename to humbug/bots/zephyr_mirror.py
diff --git a/bots/zephyr_mirror_backend.py b/humbug/bots/zephyr_mirror_backend.py
similarity index 100%
rename from bots/zephyr_mirror_backend.py
rename to humbug/bots/zephyr_mirror_backend.py
diff --git a/examples/curl-examples b/humbug/examples/curl-examples
similarity index 100%
rename from examples/curl-examples
rename to humbug/examples/curl-examples
diff --git a/examples/get-public-streams b/humbug/examples/get-public-streams
similarity index 100%
rename from examples/get-public-streams
rename to humbug/examples/get-public-streams
diff --git a/examples/humbugrc b/humbug/examples/humbugrc
similarity index 100%
rename from examples/humbugrc
rename to humbug/examples/humbugrc
diff --git a/examples/list-subscriptions b/humbug/examples/list-subscriptions
similarity index 100%
rename from examples/list-subscriptions
rename to humbug/examples/list-subscriptions
diff --git a/examples/print-messages b/humbug/examples/print-messages
similarity index 100%
rename from examples/print-messages
rename to humbug/examples/print-messages
diff --git a/examples/print-next-message b/humbug/examples/print-next-message
similarity index 100%
rename from examples/print-next-message
rename to humbug/examples/print-next-message
diff --git a/examples/send-message b/humbug/examples/send-message
similarity index 100%
rename from examples/send-message
rename to humbug/examples/send-message
diff --git a/examples/subscribe b/humbug/examples/subscribe
similarity index 100%
rename from examples/subscribe
rename to humbug/examples/subscribe
diff --git a/examples/unsubscribe b/humbug/examples/unsubscribe
similarity index 100%
rename from examples/unsubscribe
rename to humbug/examples/unsubscribe