diff --git a/app/models/jobs/base.rb b/app/models/job/base.rb
similarity index 100%
rename from app/models/jobs/base.rb
rename to app/models/job/base.rb
diff --git a/app/models/jobs/delete_account.rb b/app/models/job/delete_account.rb
similarity index 100%
rename from app/models/jobs/delete_account.rb
rename to app/models/job/delete_account.rb
diff --git a/app/models/jobs/http_multi.rb b/app/models/job/http_multi.rb
similarity index 100%
rename from app/models/jobs/http_multi.rb
rename to app/models/job/http_multi.rb
diff --git a/app/models/jobs/http_post.rb b/app/models/job/http_post.rb
similarity index 100%
rename from app/models/jobs/http_post.rb
rename to app/models/job/http_post.rb
diff --git a/app/models/jobs/invite_user_by_email.rb b/app/models/job/invite_user_by_email.rb
similarity index 100%
rename from app/models/jobs/invite_user_by_email.rb
rename to app/models/job/invite_user_by_email.rb
diff --git a/app/models/jobs/mail/also_commented.rb b/app/models/job/mail/also_commented.rb
similarity index 100%
rename from app/models/jobs/mail/also_commented.rb
rename to app/models/job/mail/also_commented.rb
diff --git a/app/models/jobs/mail/comment_on_post.rb b/app/models/job/mail/comment_on_post.rb
similarity index 100%
rename from app/models/jobs/mail/comment_on_post.rb
rename to app/models/job/mail/comment_on_post.rb
diff --git a/app/models/jobs/mail/confirm_email.rb b/app/models/job/mail/confirm_email.rb
similarity index 100%
rename from app/models/jobs/mail/confirm_email.rb
rename to app/models/job/mail/confirm_email.rb
diff --git a/app/models/jobs/mail/liked.rb b/app/models/job/mail/liked.rb
similarity index 100%
rename from app/models/jobs/mail/liked.rb
rename to app/models/job/mail/liked.rb
diff --git a/app/models/jobs/mail/mentioned.rb b/app/models/job/mail/mentioned.rb
similarity index 100%
rename from app/models/jobs/mail/mentioned.rb
rename to app/models/job/mail/mentioned.rb
diff --git a/app/models/jobs/mail/private_message.rb b/app/models/job/mail/private_message.rb
similarity index 100%
rename from app/models/jobs/mail/private_message.rb
rename to app/models/job/mail/private_message.rb
diff --git a/app/models/jobs/mail/started_sharing.rb b/app/models/job/mail/started_sharing.rb
similarity index 100%
rename from app/models/jobs/mail/started_sharing.rb
rename to app/models/job/mail/started_sharing.rb
diff --git a/app/models/jobs/notify_local_users.rb b/app/models/job/notify_local_users.rb
similarity index 100%
rename from app/models/jobs/notify_local_users.rb
rename to app/models/job/notify_local_users.rb
diff --git a/app/models/jobs/post_to_service.rb b/app/models/job/post_to_service.rb
similarity index 100%
rename from app/models/jobs/post_to_service.rb
rename to app/models/job/post_to_service.rb
diff --git a/app/models/jobs/process_photo.rb b/app/models/job/process_photo.rb
similarity index 100%
rename from app/models/jobs/process_photo.rb
rename to app/models/job/process_photo.rb
diff --git a/app/models/jobs/publish_to_hub.rb b/app/models/job/publish_to_hub.rb
similarity index 100%
rename from app/models/jobs/publish_to_hub.rb
rename to app/models/job/publish_to_hub.rb
diff --git a/app/models/jobs/receive.rb b/app/models/job/receive.rb
similarity index 100%
rename from app/models/jobs/receive.rb
rename to app/models/job/receive.rb
diff --git a/app/models/jobs/receive_local_batch.rb b/app/models/job/receive_local_batch.rb
similarity index 100%
rename from app/models/jobs/receive_local_batch.rb
rename to app/models/job/receive_local_batch.rb
diff --git a/app/models/jobs/receive_salmon.rb b/app/models/job/receive_salmon.rb
similarity index 100%
rename from app/models/jobs/receive_salmon.rb
rename to app/models/job/receive_salmon.rb
diff --git a/app/models/jobs/resend_invitation.rb b/app/models/job/resend_invitation.rb
similarity index 100%
rename from app/models/jobs/resend_invitation.rb
rename to app/models/job/resend_invitation.rb
diff --git a/app/models/jobs/socket_webfinger.rb b/app/models/job/socket_webfinger.rb
similarity index 100%
rename from app/models/jobs/socket_webfinger.rb
rename to app/models/job/socket_webfinger.rb
diff --git a/app/models/jobs/update_service_users.rb b/app/models/job/update_service_users.rb
similarity index 100%
rename from app/models/jobs/update_service_users.rb
rename to app/models/job/update_service_users.rb
diff --git a/config/initializers/resque.rb b/config/initializers/resque.rb
index ad4925ae1..f97cc4e26 100644
--- a/config/initializers/resque.rb
+++ b/config/initializers/resque.rb
@@ -1,6 +1,3 @@
-require File.join(Rails.root, 'app', 'models', 'jobs', 'base')
-Dir[File.join(Rails.root, 'app', 'models', 'jobs', '*.rb')].each { |file| require file }
-
 require 'resque'
 
 begin