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