diff --git a/app/javascript/packs/application.js b/app/javascript/packs/application.js
index c2238ccc6..090066c8a 100644
--- a/app/javascript/packs/application.js
+++ b/app/javascript/packs/application.js
@@ -29,26 +29,25 @@ require("@fortawesome/fontawesome-free/css/regular.css");
 
 importAll(require.context('../src/javascripts', true, /\.js(\.erb)?$/));
 importAll(require.context('../src/styles', true, /\.s?css(?:\.erb)?$/));
-importAll(require.context('../../components', true, /\.js(\.erb)?$/));
 importAll(require.context('../../components', true, /\.s?css(?:\.erb)?$/));
 
 import Autocomplete from "../src/javascripts/autocomplete.js";
 import Blacklist from "../src/javascripts/blacklists.js";
-import CommentComponent from "../../components/comment_component/comment_component.js";
-import CommentVotesTooltipComponent from "../../components/comment_votes_tooltip_component/comment_votes_tooltip_component.js";
+import CommentComponent from "../src/javascripts/comment_component.js";
+import CommentVotesTooltipComponent from "../src/javascripts/comment_votes_tooltip_component.js";
 import CurrentUser from "../src/javascripts/current_user.js";
 import Dtext from "../src/javascripts/dtext.js";
-import FavoritesTooltipComponent from "../../components/favorites_tooltip_component/favorites_tooltip_component.js";
-import FileUploadComponent from "../../components/file_upload_component/file_upload_component.js";
-import ForumPostComponent from "../../components/forum_post_component/forum_post_component.js";
+import FavoritesTooltipComponent from "../src/javascripts/favorites_tooltip_component.js";
+import FileUploadComponent from "../src/javascripts/file_upload_component.js";
+import ForumPostComponent from "../src/javascripts/forum_post_component.js";
 import IqdbQuery from "../src/javascripts/iqdb_queries.js";
 import Note from "../src/javascripts/notes.js";
-import MediaAssetComponent from "../../components/media_asset_component/media_asset_component.js";
-import PopupMenuComponent from "../../components/popup_menu_component/popup_menu_component.js";
+import MediaAssetComponent from "../src/javascripts/media_asset_component.js";
+import PopupMenuComponent from "../src/javascripts/popup_menu_component.js";
 import Post from "../src/javascripts/posts.js";
 import PostModeMenu from "../src/javascripts/post_mode_menu.js";
 import PostTooltip from "../src/javascripts/post_tooltips.js";
-import PostVotesTooltipComponent from "../../components/post_votes_tooltip_component/post_votes_tooltip_component.js";
+import PostVotesTooltipComponent from "../src/javascripts/post_votes_tooltip_component.js";
 import RelatedTag from "../src/javascripts/related_tag.js";
 import Shortcuts from "../src/javascripts/shortcuts.js";
 import TagCounter from "../src/javascripts/tag_counter.js";
diff --git a/app/components/comment_component/comment_component.js b/app/javascript/src/javascripts/comment_component.js
similarity index 96%
rename from app/components/comment_component/comment_component.js
rename to app/javascript/src/javascripts/comment_component.js
index 58b5c6f60..cbb03c41c 100644
--- a/app/components/comment_component/comment_component.js
+++ b/app/javascript/src/javascripts/comment_component.js
@@ -1,4 +1,4 @@
-import Utility from "../../javascript/src/javascripts/utility.js";
+import Utility from "./utility";
 
 class CommentComponent {
   static initialize() {
diff --git a/app/components/comment_votes_tooltip_component/comment_votes_tooltip_component.js b/app/javascript/src/javascripts/comment_votes_tooltip_component.js
similarity index 96%
rename from app/components/comment_votes_tooltip_component/comment_votes_tooltip_component.js
rename to app/javascript/src/javascripts/comment_votes_tooltip_component.js
index 6501131ee..6630cdc9e 100644
--- a/app/components/comment_votes_tooltip_component/comment_votes_tooltip_component.js
+++ b/app/javascript/src/javascripts/comment_votes_tooltip_component.js
@@ -1,4 +1,4 @@
-import Utility from "../../javascript/src/javascripts/utility.js";
+import Utility from "./utility";
 import { delegate, hideAll } from 'tippy.js';
 import 'tippy.js/dist/tippy.css';
 
diff --git a/app/components/favorites_tooltip_component/favorites_tooltip_component.js b/app/javascript/src/javascripts/favorites_tooltip_component.js
similarity index 96%
rename from app/components/favorites_tooltip_component/favorites_tooltip_component.js
rename to app/javascript/src/javascripts/favorites_tooltip_component.js
index 918f61786..7abefb942 100644
--- a/app/components/favorites_tooltip_component/favorites_tooltip_component.js
+++ b/app/javascript/src/javascripts/favorites_tooltip_component.js
@@ -1,4 +1,4 @@
-import Utility from "../../javascript/src/javascripts/utility.js";
+import Utility from "./utility";
 import { delegate, hideAll } from 'tippy.js';
 import 'tippy.js/dist/tippy.css';
 
diff --git a/app/components/file_upload_component/file_upload_component.js b/app/javascript/src/javascripts/file_upload_component.js
similarity index 98%
rename from app/components/file_upload_component/file_upload_component.js
rename to app/javascript/src/javascripts/file_upload_component.js
index 265656634..ab1fa0b36 100644
--- a/app/components/file_upload_component/file_upload_component.js
+++ b/app/javascript/src/javascripts/file_upload_component.js
@@ -1,5 +1,5 @@
 import Dropzone from 'dropzone';
-import Utility from "../../javascript/src/javascripts/utility.js";
+import Utility from "./utility";
 import capitalize from "lodash/capitalize";
 
 export default class FileUploadComponent {
diff --git a/app/components/forum_post_component/forum_post_component.js b/app/javascript/src/javascripts/forum_post_component.js
similarity index 96%
rename from app/components/forum_post_component/forum_post_component.js
rename to app/javascript/src/javascripts/forum_post_component.js
index 67d566a01..c22e67edc 100644
--- a/app/components/forum_post_component/forum_post_component.js
+++ b/app/javascript/src/javascripts/forum_post_component.js
@@ -1,4 +1,4 @@
-import Utility from "../../javascript/src/javascripts/utility.js";
+import Utility from "./utility";
 
 class ForumPostComponent {
   static initialize() {
diff --git a/app/components/media_asset_component/media_asset_component.js b/app/javascript/src/javascripts/media_asset_component.js
similarity index 100%
rename from app/components/media_asset_component/media_asset_component.js
rename to app/javascript/src/javascripts/media_asset_component.js
diff --git a/app/components/popup_menu_component/popup_menu_component.js b/app/javascript/src/javascripts/popup_menu_component.js
similarity index 100%
rename from app/components/popup_menu_component/popup_menu_component.js
rename to app/javascript/src/javascripts/popup_menu_component.js
diff --git a/app/components/post_votes_tooltip_component/post_votes_tooltip_component.js b/app/javascript/src/javascripts/post_votes_tooltip_component.js
similarity index 96%
rename from app/components/post_votes_tooltip_component/post_votes_tooltip_component.js
rename to app/javascript/src/javascripts/post_votes_tooltip_component.js
index d9223d9ab..3bd31e957 100644
--- a/app/components/post_votes_tooltip_component/post_votes_tooltip_component.js
+++ b/app/javascript/src/javascripts/post_votes_tooltip_component.js
@@ -1,4 +1,4 @@
-import Utility from "../../javascript/src/javascripts/utility.js";
+import Utility from "./utility";
 import { delegate, hideAll } from 'tippy.js';
 import 'tippy.js/dist/tippy.css';
 
diff --git a/app/javascript/src/javascripts/related_tag.js b/app/javascript/src/javascripts/related_tag.js
index 650f5ec3a..912b1c40c 100644
--- a/app/javascript/src/javascripts/related_tag.js
+++ b/app/javascript/src/javascripts/related_tag.js
@@ -1,4 +1,4 @@
-import SourceDataComponent from '../../../components/source_data_component/source_data_component.js';
+import SourceDataComponent from "./source_data_component.js";
 import Utility from './utility';
 
 let RelatedTag = {};
diff --git a/app/components/source_data_component/source_data_component.js b/app/javascript/src/javascripts/source_data_component.js
similarity index 100%
rename from app/components/source_data_component/source_data_component.js
rename to app/javascript/src/javascripts/source_data_component.js