diff --git a/plugins/poll/assets/javascripts/discourse/templates/components/poll-breakdown-chart.hbs b/plugins/poll/assets/javascripts/discourse/components/poll-breakdown-chart.hbs
similarity index 100%
rename from plugins/poll/assets/javascripts/discourse/templates/components/poll-breakdown-chart.hbs
rename to plugins/poll/assets/javascripts/discourse/components/poll-breakdown-chart.hbs
diff --git a/plugins/poll/assets/javascripts/components/poll-breakdown-chart.js b/plugins/poll/assets/javascripts/discourse/components/poll-breakdown-chart.js
similarity index 98%
rename from plugins/poll/assets/javascripts/components/poll-breakdown-chart.js
rename to plugins/poll/assets/javascripts/discourse/components/poll-breakdown-chart.js
index 20ec3b22b07..fb9a9a2d3b0 100644
--- a/plugins/poll/assets/javascripts/components/poll-breakdown-chart.js
+++ b/plugins/poll/assets/javascripts/discourse/components/poll-breakdown-chart.js
@@ -1,6 +1,6 @@
 import Component from "@ember/component";
 import I18n from "I18n";
-import { PIE_CHART_TYPE } from "discourse/plugins/poll/controllers/poll-ui-builder";
+import { PIE_CHART_TYPE } from "../controllers/poll-ui-builder";
 import discourseComputed from "discourse-common/utils/decorators";
 import { getColors } from "discourse/plugins/poll/lib/chart-colors";
 import { htmlSafe } from "@ember/template";
diff --git a/plugins/poll/assets/javascripts/discourse/templates/components/poll-breakdown-option.hbs b/plugins/poll/assets/javascripts/discourse/components/poll-breakdown-option.hbs
similarity index 100%
rename from plugins/poll/assets/javascripts/discourse/templates/components/poll-breakdown-option.hbs
rename to plugins/poll/assets/javascripts/discourse/components/poll-breakdown-option.hbs
diff --git a/plugins/poll/assets/javascripts/components/poll-breakdown-option.js b/plugins/poll/assets/javascripts/discourse/components/poll-breakdown-option.js
similarity index 100%
rename from plugins/poll/assets/javascripts/components/poll-breakdown-option.js
rename to plugins/poll/assets/javascripts/discourse/components/poll-breakdown-option.js
diff --git a/plugins/poll/assets/javascripts/controllers/poll-breakdown.js b/plugins/poll/assets/javascripts/discourse/controllers/poll-breakdown.js
similarity index 100%
rename from plugins/poll/assets/javascripts/controllers/poll-breakdown.js
rename to plugins/poll/assets/javascripts/discourse/controllers/poll-breakdown.js
diff --git a/plugins/poll/assets/javascripts/controllers/poll-ui-builder.js b/plugins/poll/assets/javascripts/discourse/controllers/poll-ui-builder.js
similarity index 100%
rename from plugins/poll/assets/javascripts/controllers/poll-ui-builder.js
rename to plugins/poll/assets/javascripts/discourse/controllers/poll-ui-builder.js
diff --git a/plugins/poll/assets/javascripts/initializers/add-poll-ui-builder.js b/plugins/poll/assets/javascripts/discourse/initializers/add-poll-ui-builder.js
similarity index 100%
rename from plugins/poll/assets/javascripts/initializers/add-poll-ui-builder.js
rename to plugins/poll/assets/javascripts/discourse/initializers/add-poll-ui-builder.js
diff --git a/plugins/poll/assets/javascripts/initializers/extend-for-poll.js b/plugins/poll/assets/javascripts/discourse/initializers/extend-for-poll.js
similarity index 100%
rename from plugins/poll/assets/javascripts/initializers/extend-for-poll.js
rename to plugins/poll/assets/javascripts/discourse/initializers/extend-for-poll.js
diff --git a/plugins/poll/assets/javascripts/widgets/discourse-poll.js b/plugins/poll/assets/javascripts/discourse/widgets/discourse-poll.js
similarity index 99%
rename from plugins/poll/assets/javascripts/widgets/discourse-poll.js
rename to plugins/poll/assets/javascripts/discourse/widgets/discourse-poll.js
index a2972b84711..e31cd53cf1a 100644
--- a/plugins/poll/assets/javascripts/widgets/discourse-poll.js
+++ b/plugins/poll/assets/javascripts/discourse/widgets/discourse-poll.js
@@ -1,5 +1,5 @@
 import I18n from "I18n";
-import { PIE_CHART_TYPE } from "discourse/plugins/poll/controllers/poll-ui-builder";
+import { PIE_CHART_TYPE } from "../controllers/poll-ui-builder";
 import RawHtml from "discourse/widgets/raw-html";
 import { ajax } from "discourse/lib/ajax";
 import { avatarFor } from "discourse/widgets/post";
diff --git a/plugins/poll/test/javascripts/unit/controllers/poll-ui-builder-test.js b/plugins/poll/test/javascripts/unit/controllers/poll-ui-builder-test.js
index 7da954e2733..5a810bb5e94 100644
--- a/plugins/poll/test/javascripts/unit/controllers/poll-ui-builder-test.js
+++ b/plugins/poll/test/javascripts/unit/controllers/poll-ui-builder-test.js
@@ -4,7 +4,7 @@ import {
   MULTIPLE_POLL_TYPE,
   NUMBER_POLL_TYPE,
   REGULAR_POLL_TYPE,
-} from "discourse/plugins/poll/controllers/poll-ui-builder";
+} from "discourse/plugins/poll/discourse/controllers/poll-ui-builder";
 import { settled } from "@ember/test-helpers";
 
 function setupController(ctx) {