diff --git a/plugins/discourse-narrative-bot/autoload/jobs/onceoff/grant_badges.rb b/plugins/discourse-narrative-bot/autoload/jobs/onceoff/discourse_narrative_bot/grant_badges.rb
similarity index 100%
rename from plugins/discourse-narrative-bot/autoload/jobs/onceoff/grant_badges.rb
rename to plugins/discourse-narrative-bot/autoload/jobs/onceoff/discourse_narrative_bot/grant_badges.rb
diff --git a/plugins/discourse-narrative-bot/autoload/jobs/onceoff/remap_old_bot_images.rb b/plugins/discourse-narrative-bot/autoload/jobs/onceoff/discourse_narrative_bot/remap_old_bot_images.rb
similarity index 100%
rename from plugins/discourse-narrative-bot/autoload/jobs/onceoff/remap_old_bot_images.rb
rename to plugins/discourse-narrative-bot/autoload/jobs/onceoff/discourse_narrative_bot/remap_old_bot_images.rb
diff --git a/plugins/discourse-narrative-bot/autoload/jobs/bot_input.rb b/plugins/discourse-narrative-bot/autoload/jobs/regular/bot_input.rb
similarity index 100%
rename from plugins/discourse-narrative-bot/autoload/jobs/bot_input.rb
rename to plugins/discourse-narrative-bot/autoload/jobs/regular/bot_input.rb
diff --git a/plugins/discourse-narrative-bot/autoload/jobs/narrative_init.rb b/plugins/discourse-narrative-bot/autoload/jobs/regular/narrative_init.rb
similarity index 100%
rename from plugins/discourse-narrative-bot/autoload/jobs/narrative_init.rb
rename to plugins/discourse-narrative-bot/autoload/jobs/regular/narrative_init.rb
diff --git a/plugins/discourse-narrative-bot/autoload/jobs/narrative_timeout.rb b/plugins/discourse-narrative-bot/autoload/jobs/regular/narrative_timeout.rb
similarity index 100%
rename from plugins/discourse-narrative-bot/autoload/jobs/narrative_timeout.rb
rename to plugins/discourse-narrative-bot/autoload/jobs/regular/narrative_timeout.rb
diff --git a/plugins/discourse-narrative-bot/autoload/jobs/send_default_welcome_message.rb b/plugins/discourse-narrative-bot/autoload/jobs/regular/send_default_welcome_message.rb
similarity index 100%
rename from plugins/discourse-narrative-bot/autoload/jobs/send_default_welcome_message.rb
rename to plugins/discourse-narrative-bot/autoload/jobs/regular/send_default_welcome_message.rb
diff --git a/plugins/discourse-narrative-bot/plugin.rb b/plugins/discourse-narrative-bot/plugin.rb
index c0fa830128a..314e0c7182e 100644
--- a/plugins/discourse-narrative-bot/plugin.rb
+++ b/plugins/discourse-narrative-bot/plugin.rb
@@ -19,7 +19,7 @@ if Rails.env == "development"
   # 3. we have a post_edited hook that queues a job for bot input
   # 4. if you are not running sidekiq in dev every time you save a post it will trigger it
   # 5. but the constant can not be autoloaded
-  Rails.configuration.autoload_paths << File.expand_path('../autoload', __FILE__)
+  Rails.configuration.autoload_paths << File.expand_path('../autoload/jobs', __FILE__)
 end
 
 require_relative 'lib/discourse_narrative_bot/welcome_post_type_site_setting.rb'
@@ -31,12 +31,12 @@ after_initialize do
   Mime::Type.register "image/svg+xml", :svg
 
   [
-    '../autoload/jobs/bot_input.rb',
-    '../autoload/jobs/narrative_timeout.rb',
-    '../autoload/jobs/narrative_init.rb',
-    '../autoload/jobs/send_default_welcome_message.rb',
-    '../autoload/jobs/onceoff/grant_badges.rb',
-    '../autoload/jobs/onceoff/remap_old_bot_images.rb',
+    '../autoload/jobs/regular/bot_input.rb',
+    '../autoload/jobs/regular/narrative_timeout.rb',
+    '../autoload/jobs/regular/narrative_init.rb',
+    '../autoload/jobs/regular/send_default_welcome_message.rb',
+    '../autoload/jobs/onceoff/discourse_narrative_bot/grant_badges.rb',
+    '../autoload/jobs/onceoff/discourse_narrative_bot/remap_old_bot_images.rb',
     '../lib/discourse_narrative_bot/actions.rb',
     '../lib/discourse_narrative_bot/base.rb',
     '../lib/discourse_narrative_bot/new_user_narrative.rb',