diff --git a/app/javascript/bridge/initializers/index.js b/app/javascript/bridge/initializers/index.js
deleted file mode 100644
index 8e17fab0c..000000000
--- a/app/javascript/bridge/initializers/index.js
+++ /dev/null
@@ -1 +0,0 @@
-import "bridge/initializers/bridge_element"
diff --git a/app/javascript/bridge/controllers/bridge/buttons_controller.js b/app/javascript/controllers/bridge/buttons_controller.js
similarity index 95%
rename from app/javascript/bridge/controllers/bridge/buttons_controller.js
rename to app/javascript/controllers/bridge/buttons_controller.js
index 7cafc93fe..e825f6413 100644
--- a/app/javascript/bridge/controllers/bridge/buttons_controller.js
+++ b/app/javascript/controllers/bridge/buttons_controller.js
@@ -5,6 +5,10 @@ export default class extends BridgeComponent {
   static component = "buttons"
   static targets = [ "button" ]
 
+  static shouldLoad() {
+    return true
+  }
+
   connect() {
     super.connect()
     if (!this.hasButtonTarget) return
@@ -35,4 +39,4 @@ export default class extends BridgeComponent {
     const selectedIndex = message.data.selectedIndex
     this.buttonTargets[selectedIndex].click()
   }
-}
\ No newline at end of file
+}
diff --git a/app/javascript/bridge/controllers/bridge/form_controller.js b/app/javascript/controllers/bridge/form_controller.js
similarity index 100%
rename from app/javascript/bridge/controllers/bridge/form_controller.js
rename to app/javascript/controllers/bridge/form_controller.js
diff --git a/app/javascript/bridge/controllers/bridge/insets_controller.js b/app/javascript/controllers/bridge/insets_controller.js
similarity index 100%
rename from app/javascript/bridge/controllers/bridge/insets_controller.js
rename to app/javascript/controllers/bridge/insets_controller.js
diff --git a/app/javascript/bridge/controllers/bridge/overflow_menu_controller.js b/app/javascript/controllers/bridge/overflow_menu_controller.js
similarity index 100%
rename from app/javascript/bridge/controllers/bridge/overflow_menu_controller.js
rename to app/javascript/controllers/bridge/overflow_menu_controller.js
diff --git a/app/javascript/bridge/controllers/bridge/page_controller.js b/app/javascript/controllers/bridge/page_controller.js
similarity index 97%
rename from app/javascript/bridge/controllers/bridge/page_controller.js
rename to app/javascript/controllers/bridge/page_controller.js
index b31ba7fe3..0fa6187dd 100644
--- a/app/javascript/bridge/controllers/bridge/page_controller.js
+++ b/app/javascript/controllers/bridge/page_controller.js
@@ -1,5 +1,5 @@
 import { BridgeComponent } from "@hotwired/hotwire-native-bridge"
-import { viewport } from "bridge/helpers/viewport"
+import { viewport } from "helpers/bridge/viewport_helpers"
 import { nextFrame } from "helpers/timing_helpers"
 
 export default class extends BridgeComponent {
diff --git a/app/javascript/bridge/helpers/viewport.js b/app/javascript/helpers/bridge/viewport_helpers.js
similarity index 100%
rename from app/javascript/bridge/helpers/viewport.js
rename to app/javascript/helpers/bridge/viewport_helpers.js
diff --git a/app/javascript/bridge/initializers/bridge_element.js b/app/javascript/initializers/bridge/bridge_element.js
similarity index 100%
rename from app/javascript/bridge/initializers/bridge_element.js
rename to app/javascript/initializers/bridge/bridge_element.js
diff --git a/app/javascript/initializers/index.js b/app/javascript/initializers/index.js
index d128addc9..90ef36a26 100644
--- a/app/javascript/initializers/index.js
+++ b/app/javascript/initializers/index.js
@@ -1,2 +1,2 @@
 import "initializers/current"
-import "bridge/initializers"
+import "initializers/bridge/bridge_element"