diff --git a/app/controllers/assignments_controller.rb b/app/controllers/bubbles/assignments_controller.rb
similarity index 93%
rename from app/controllers/assignments_controller.rb
rename to app/controllers/bubbles/assignments_controller.rb
index eb9c4e74f..f7cada259 100644
--- a/app/controllers/assignments_controller.rb
+++ b/app/controllers/bubbles/assignments_controller.rb
@@ -1,4 +1,4 @@
-class AssignmentsController < ApplicationController
+class Bubbles::AssignmentsController < ApplicationController
   include BubbleScoped
 
   def new
diff --git a/config/routes.rb b/config/routes.rb
index 3433bc802..a3ac2ee4a 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -59,9 +59,9 @@ Rails.application.routes.draw do
         resource :recover
         resources :stagings
         resource :watch
+        resources :assignments
       end
 
-      resources :assignments
       resources :taggings
     end
   end
diff --git a/test/controllers/assignments_controller_test.rb b/test/controllers/bubbles/assignments_controller_test.rb
similarity index 90%
rename from test/controllers/assignments_controller_test.rb
rename to test/controllers/bubbles/assignments_controller_test.rb
index 4bec58298..81156b23e 100644
--- a/test/controllers/assignments_controller_test.rb
+++ b/test/controllers/bubbles/assignments_controller_test.rb
@@ -1,6 +1,6 @@
 require "test_helper"
 
-class AssignmentsControllerTest < ActionDispatch::IntegrationTest
+class Bubbles::AssignmentsControllerTest < ActionDispatch::IntegrationTest
   setup do
     sign_in_as :kevin
   end