diff --git a/contrib_bots/bots/commute_bot/commute_bot.config b/contrib_bots/bots/commute/commute.config
similarity index 100%
rename from contrib_bots/bots/commute_bot/commute_bot.config
rename to contrib_bots/bots/commute/commute.config
diff --git a/contrib_bots/bots/define_bot/assets/correct_word.png b/contrib_bots/bots/define/assets/correct_word.png
similarity index 100%
rename from contrib_bots/bots/define_bot/assets/correct_word.png
rename to contrib_bots/bots/define/assets/correct_word.png
diff --git a/contrib_bots/bots/define_bot/assets/wrong_word.png b/contrib_bots/bots/define/assets/wrong_word.png
similarity index 100%
rename from contrib_bots/bots/define_bot/assets/wrong_word.png
rename to contrib_bots/bots/define/assets/wrong_word.png
diff --git a/contrib_bots/bots/encrypt_bot/assets/EncryptBot-terminal.png b/contrib_bots/bots/encrypt/assets/EncryptBot-terminal.png
similarity index 100%
rename from contrib_bots/bots/encrypt_bot/assets/EncryptBot-terminal.png
rename to contrib_bots/bots/encrypt/assets/EncryptBot-terminal.png
diff --git a/contrib_bots/bots/encrypt_bot/assets/EncryptBot-test.png b/contrib_bots/bots/encrypt/assets/EncryptBot-test.png
similarity index 100%
rename from contrib_bots/bots/encrypt_bot/assets/EncryptBot-test.png
rename to contrib_bots/bots/encrypt/assets/EncryptBot-test.png
diff --git a/contrib_bots/bots/encrypt_bot/assets/EncryptBot-test2.png b/contrib_bots/bots/encrypt/assets/EncryptBot-test2.png
similarity index 100%
rename from contrib_bots/bots/encrypt_bot/assets/EncryptBot-test2.png
rename to contrib_bots/bots/encrypt/assets/EncryptBot-test2.png
diff --git a/contrib_bots/bots/encrypt_bot/assets/EncryptBot-test3.png b/contrib_bots/bots/encrypt/assets/EncryptBot-test3.png
similarity index 100%
rename from contrib_bots/bots/encrypt_bot/assets/EncryptBot-test3.png
rename to contrib_bots/bots/encrypt/assets/EncryptBot-test3.png
diff --git a/contrib_bots/bots/encrypt_bot/readme.md b/contrib_bots/bots/encrypt/readme.md
similarity index 100%
rename from contrib_bots/bots/encrypt_bot/readme.md
rename to contrib_bots/bots/encrypt/readme.md
diff --git a/contrib_bots/bots/encrypt_bot/tests.py b/contrib_bots/bots/encrypt/tests.py
similarity index 100%
rename from contrib_bots/bots/encrypt_bot/tests.py
rename to contrib_bots/bots/encrypt/tests.py
diff --git a/contrib_bots/bots/howdoi_bot/assets/answer_howdoi_all.png b/contrib_bots/bots/howdoi/assets/answer_howdoi_all.png
similarity index 100%
rename from contrib_bots/bots/howdoi_bot/assets/answer_howdoi_all.png
rename to contrib_bots/bots/howdoi/assets/answer_howdoi_all.png
diff --git a/contrib_bots/bots/howdoi_bot/assets/answer_howdowe.png b/contrib_bots/bots/howdoi/assets/answer_howdowe.png
similarity index 100%
rename from contrib_bots/bots/howdoi_bot/assets/answer_howdowe.png
rename to contrib_bots/bots/howdoi/assets/answer_howdowe.png
diff --git a/contrib_bots/bots/howdoi_bot/assets/question_howdoi_all.png b/contrib_bots/bots/howdoi/assets/question_howdoi_all.png
similarity index 100%
rename from contrib_bots/bots/howdoi_bot/assets/question_howdoi_all.png
rename to contrib_bots/bots/howdoi/assets/question_howdoi_all.png
diff --git a/contrib_bots/bots/howdoi_bot/assets/question_howdowe.png b/contrib_bots/bots/howdoi/assets/question_howdowe.png
similarity index 100%
rename from contrib_bots/bots/howdoi_bot/assets/question_howdowe.png
rename to contrib_bots/bots/howdoi/assets/question_howdowe.png
diff --git a/contrib_bots/bots/howdoi_bot/howdoi_bot.py b/contrib_bots/bots/howdoi/howdoi.py
similarity index 100%
rename from contrib_bots/bots/howdoi_bot/howdoi_bot.py
rename to contrib_bots/bots/howdoi/howdoi.py
diff --git a/contrib_bots/bots/howdoi_bot/readme.md b/contrib_bots/bots/howdoi/readme.md
similarity index 100%
rename from contrib_bots/bots/howdoi_bot/readme.md
rename to contrib_bots/bots/howdoi/readme.md
diff --git a/contrib_bots/bots/tictactoe-bot/tictactoe-bot.py b/contrib_bots/bots/tictactoe/tictactoe.py
similarity index 100%
rename from contrib_bots/bots/tictactoe-bot/tictactoe-bot.py
rename to contrib_bots/bots/tictactoe/tictactoe.py
diff --git a/contrib_bots/bots/yoda_bot/assets/yoda-speak-api.png b/contrib_bots/bots/yoda/assets/yoda-speak-api.png
similarity index 100%
rename from contrib_bots/bots/yoda_bot/assets/yoda-speak-api.png
rename to contrib_bots/bots/yoda/assets/yoda-speak-api.png
diff --git a/contrib_bots/bots/yoda_bot/yoda_bot.config b/contrib_bots/bots/yoda/yoda.config
similarity index 100%
rename from contrib_bots/bots/yoda_bot/yoda_bot.config
rename to contrib_bots/bots/yoda/yoda.config