diff --git a/web_src/js/features/admin/common.js b/web_src/js/admin/common.js
similarity index 98%
rename from web_src/js/features/admin/common.js
rename to web_src/js/admin/common.js
index b35502d52f9fa..df0b2f10c9e7e 100644
--- a/web_src/js/features/admin/common.js
+++ b/web_src/js/admin/common.js
@@ -1,7 +1,7 @@
 import $ from 'jquery';
-import {checkAppUrl} from '../common-global.js';
-import {hideElem, showElem, toggleElem} from '../../utils/dom.js';
-import {POST} from '../../modules/fetch.js';
+import {checkAppUrl} from '../features/common-global.js';
+import {hideElem, showElem, toggleElem} from '../utils/dom.js';
+import {POST} from '../modules/fetch.js';
 
 const {appSubUrl} = window.config;
 
diff --git a/web_src/js/features/admin/config.js b/web_src/js/admin/config.js
similarity index 87%
rename from web_src/js/features/admin/config.js
rename to web_src/js/admin/config.js
index c3823425adb58..c075e556c1198 100644
--- a/web_src/js/features/admin/config.js
+++ b/web_src/js/admin/config.js
@@ -1,5 +1,5 @@
-import {showTemporaryTooltip} from '../../modules/tippy.js';
-import {POST} from '../../modules/fetch.js';
+import {showTemporaryTooltip} from '../modules/tippy.js';
+import {POST} from '../modules/fetch.js';
 
 const {appSubUrl} = window.config;
 
diff --git a/web_src/js/features/admin/emails.js b/web_src/js/admin/emails.js
similarity index 100%
rename from web_src/js/features/admin/emails.js
rename to web_src/js/admin/emails.js
diff --git a/web_src/js/features/admin/users.js b/web_src/js/admin/users.js
similarity index 100%
rename from web_src/js/features/admin/users.js
rename to web_src/js/admin/users.js
diff --git a/web_src/js/features/comp/ComboMarkdownEditor.js b/web_src/js/comp/ComboMarkdownEditor.js
similarity index 97%
rename from web_src/js/features/comp/ComboMarkdownEditor.js
rename to web_src/js/comp/ComboMarkdownEditor.js
index d3fab375a9396..70dfcad63e899 100644
--- a/web_src/js/features/comp/ComboMarkdownEditor.js
+++ b/web_src/js/comp/ComboMarkdownEditor.js
@@ -1,15 +1,15 @@
 import '@github/markdown-toolbar-element';
 import '@github/text-expander-element';
 import $ from 'jquery';
-import {attachTribute} from '../tribute.js';
-import {hideElem, showElem, autosize, isElemVisible} from '../../utils/dom.js';
+import {attachTribute} from '../features/tribute.js';
+import {hideElem, showElem, autosize, isElemVisible} from '../utils/dom.js';
 import {initEasyMDEPaste, initTextareaPaste} from './Paste.js';
 import {handleGlobalEnterQuickSubmit} from './QuickSubmit.js';
-import {renderPreviewPanelContent} from '../repo-editor.js';
+import {renderPreviewPanelContent} from '../repo/editor.js';
 import {easyMDEToolbarActions} from './EasyMDEToolbarActions.js';
 import {initTextExpander} from './TextExpander.js';
-import {showErrorToast} from '../../modules/toast.js';
-import {POST} from '../../modules/fetch.js';
+import {showErrorToast} from '../modules/toast.js';
+import {POST} from '../modules/fetch.js';
 
 let elementIdCounter = 0;
 
diff --git a/web_src/js/features/comp/ConfirmModal.js b/web_src/js/comp/ConfirmModal.js
similarity index 95%
rename from web_src/js/features/comp/ConfirmModal.js
rename to web_src/js/comp/ConfirmModal.js
index e64996a3529a7..514c967cb439b 100644
--- a/web_src/js/features/comp/ConfirmModal.js
+++ b/web_src/js/comp/ConfirmModal.js
@@ -1,5 +1,5 @@
 import $ from 'jquery';
-import {svg} from '../../svg.js';
+import {svg} from '../svg.js';
 import {htmlEscape} from 'escape-goat';
 
 const {i18n} = window.config;
diff --git a/web_src/js/features/comp/EasyMDEToolbarActions.js b/web_src/js/comp/EasyMDEToolbarActions.js
similarity index 99%
rename from web_src/js/features/comp/EasyMDEToolbarActions.js
rename to web_src/js/comp/EasyMDEToolbarActions.js
index c97d683704b1c..a600a4f230d83 100644
--- a/web_src/js/features/comp/EasyMDEToolbarActions.js
+++ b/web_src/js/comp/EasyMDEToolbarActions.js
@@ -1,4 +1,4 @@
-import {svg} from '../../svg.js';
+import {svg} from '../svg.js';
 
 export function easyMDEToolbarActions(EasyMDE, editor) {
   const actions = {
diff --git a/web_src/js/features/comp/LabelEdit.js b/web_src/js/comp/LabelEdit.js
similarity index 100%
rename from web_src/js/features/comp/LabelEdit.js
rename to web_src/js/comp/LabelEdit.js
diff --git a/web_src/js/features/comp/Paste.js b/web_src/js/comp/Paste.js
similarity index 95%
rename from web_src/js/features/comp/Paste.js
rename to web_src/js/comp/Paste.js
index b26296d1fc967..6d337c75e4ee3 100644
--- a/web_src/js/features/comp/Paste.js
+++ b/web_src/js/comp/Paste.js
@@ -1,8 +1,8 @@
 import {htmlEscape} from 'escape-goat';
-import {POST} from '../../modules/fetch.js';
-import {imageInfo} from '../../utils/image.js';
-import {getPastedContent, replaceTextareaSelection} from '../../utils/dom.js';
-import {isUrl} from '../../utils/url.js';
+import {POST} from '../modules/fetch.js';
+import {imageInfo} from '../utils/image.js';
+import {getPastedContent, replaceTextareaSelection} from '../utils/dom.js';
+import {isUrl} from '../utils/url.js';
 
 async function uploadFile(file, uploadUrl) {
   const formData = new FormData();
diff --git a/web_src/js/features/comp/QuickSubmit.js b/web_src/js/comp/QuickSubmit.js
similarity index 100%
rename from web_src/js/features/comp/QuickSubmit.js
rename to web_src/js/comp/QuickSubmit.js
diff --git a/web_src/js/features/comp/ReactionSelector.js b/web_src/js/comp/ReactionSelector.js
similarity index 97%
rename from web_src/js/features/comp/ReactionSelector.js
rename to web_src/js/comp/ReactionSelector.js
index e507b89632af4..623538a29d682 100644
--- a/web_src/js/features/comp/ReactionSelector.js
+++ b/web_src/js/comp/ReactionSelector.js
@@ -1,5 +1,5 @@
 import $ from 'jquery';
-import {POST} from '../../modules/fetch.js';
+import {POST} from '../modules/fetch.js';
 
 export function initCompReactionSelector() {
   for (const container of document.querySelectorAll('.issue-content, .diff-file-body')) {
diff --git a/web_src/js/features/comp/SearchUserBox.js b/web_src/js/comp/SearchUserBox.js
similarity index 100%
rename from web_src/js/features/comp/SearchUserBox.js
rename to web_src/js/comp/SearchUserBox.js
diff --git a/web_src/js/features/comp/TextExpander.js b/web_src/js/comp/TextExpander.js
similarity index 94%
rename from web_src/js/features/comp/TextExpander.js
rename to web_src/js/comp/TextExpander.js
index 128a2ddff0e4d..6194eee8efe0b 100644
--- a/web_src/js/features/comp/TextExpander.js
+++ b/web_src/js/comp/TextExpander.js
@@ -1,5 +1,5 @@
-import {matchEmoji, matchMention} from '../../utils/match.js';
-import {emojiString} from '../emoji.js';
+import {matchEmoji, matchMention} from '../utils/match.js';
+import {emojiString} from '../features/emoji.js';
 
 export function initTextExpander(expander) {
   expander?.addEventListener('text-expander-change', ({detail: {key, provide, text}}) => {
diff --git a/web_src/js/features/comp/WebHookEditor.js b/web_src/js/comp/WebHookEditor.js
similarity index 92%
rename from web_src/js/features/comp/WebHookEditor.js
rename to web_src/js/comp/WebHookEditor.js
index d74b59fd2aa64..bcde62348ee94 100644
--- a/web_src/js/features/comp/WebHookEditor.js
+++ b/web_src/js/comp/WebHookEditor.js
@@ -1,5 +1,5 @@
-import {POST} from '../../modules/fetch.js';
-import {hideElem, showElem, toggleElem} from '../../utils/dom.js';
+import {POST} from '../modules/fetch.js';
+import {hideElem, showElem, toggleElem} from '../utils/dom.js';
 
 export function initCompWebHookEditor() {
   if (!document.querySelectorAll('.new.webhook').length) {
diff --git a/web_src/js/components/DiffFileList.vue b/web_src/js/components/DiffFileList.vue
index 916780d9137dc..07fc96f564c00 100644
--- a/web_src/js/components/DiffFileList.vue
+++ b/web_src/js/components/DiffFileList.vue
@@ -1,5 +1,5 @@
 <script>
-import {loadMoreFiles} from '../features/repo-diff.js';
+import {loadMoreFiles} from '../repo/diff.js';
 import {diffTreeStore} from '../modules/stores.js';
 
 export default {
diff --git a/web_src/js/components/DiffFileTree.vue b/web_src/js/components/DiffFileTree.vue
index cddfee1e04d05..cc58622f4b41d 100644
--- a/web_src/js/components/DiffFileTree.vue
+++ b/web_src/js/components/DiffFileTree.vue
@@ -1,6 +1,6 @@
 <script>
 import DiffFileTreeItem from './DiffFileTreeItem.vue';
-import {loadMoreFiles} from '../features/repo-diff.js';
+import {loadMoreFiles} from '../repo/diff.js';
 import {toggleElem} from '../utils/dom.js';
 import {diffTreeStore} from '../modules/stores.js';
 import {setFileFolding} from '../features/file-fold.js';
diff --git a/web_src/js/features/common-global.js b/web_src/js/features/common-global.js
index e7db9b23364bb..11fc6ee086f0a 100644
--- a/web_src/js/features/common-global.js
+++ b/web_src/js/features/common-global.js
@@ -3,12 +3,12 @@ import '../vendor/jquery.are-you-sure.js';
 import {clippie} from 'clippie';
 import {createDropzone} from './dropzone.js';
 import {showGlobalErrorMessage} from '../bootstrap.js';
-import {handleGlobalEnterQuickSubmit} from './comp/QuickSubmit.js';
+import {handleGlobalEnterQuickSubmit} from '../comp/QuickSubmit.js';
 import {svg} from '../svg.js';
 import {hideElem, showElem, toggleElem, initSubmitEventPolyfill, submitEventSubmitter} from '../utils/dom.js';
 import {htmlEscape} from 'escape-goat';
 import {showTemporaryTooltip} from '../modules/tippy.js';
-import {confirmModal} from './comp/ConfirmModal.js';
+import {confirmModal} from '../comp/ConfirmModal.js';
 import {showErrorToast} from '../modules/toast.js';
 import {request, POST, GET} from '../modules/fetch.js';
 import '../htmx.js';
diff --git a/web_src/js/features/common-organization.js b/web_src/js/features/common-organization.js
index 442714a3d676a..f2b0b6b742df8 100644
--- a/web_src/js/features/common-organization.js
+++ b/web_src/js/features/common-organization.js
@@ -1,4 +1,4 @@
-import {initCompLabelEdit} from './comp/LabelEdit.js';
+import {initCompLabelEdit} from '../comp/LabelEdit.js';
 import {toggleElem} from '../utils/dom.js';
 
 export function initCommonOrganization() {
diff --git a/web_src/js/modules/fomantic/api.js b/web_src/js/fomantic/api.js
similarity index 100%
rename from web_src/js/modules/fomantic/api.js
rename to web_src/js/fomantic/api.js
diff --git a/web_src/js/modules/fomantic/aria.md b/web_src/js/fomantic/aria.md
similarity index 100%
rename from web_src/js/modules/fomantic/aria.md
rename to web_src/js/fomantic/aria.md
diff --git a/web_src/js/modules/fomantic/base.js b/web_src/js/fomantic/base.js
similarity index 100%
rename from web_src/js/modules/fomantic/base.js
rename to web_src/js/fomantic/base.js
diff --git a/web_src/js/modules/fomantic/checkbox.js b/web_src/js/fomantic/checkbox.js
similarity index 100%
rename from web_src/js/modules/fomantic/checkbox.js
rename to web_src/js/fomantic/checkbox.js
diff --git a/web_src/js/modules/fomantic/dropdown.js b/web_src/js/fomantic/dropdown.js
similarity index 100%
rename from web_src/js/modules/fomantic/dropdown.js
rename to web_src/js/fomantic/dropdown.js
diff --git a/web_src/js/modules/fomantic.js b/web_src/js/fomantic/index.js
similarity index 78%
rename from web_src/js/modules/fomantic.js
rename to web_src/js/fomantic/index.js
index d205c2b2ee57d..329c96d06400c 100644
--- a/web_src/js/modules/fomantic.js
+++ b/web_src/js/fomantic/index.js
@@ -1,9 +1,9 @@
 import $ from 'jquery';
-import {initFomanticApiPatch} from './fomantic/api.js';
-import {initAriaCheckboxPatch} from './fomantic/checkbox.js';
-import {initAriaDropdownPatch} from './fomantic/dropdown.js';
-import {initAriaModalPatch} from './fomantic/modal.js';
-import {initFomanticTransition} from './fomantic/transition.js';
+import {initFomanticApiPatch} from './api.js';
+import {initAriaCheckboxPatch} from './checkbox.js';
+import {initAriaDropdownPatch} from './dropdown.js';
+import {initAriaModalPatch} from './modal.js';
+import {initFomanticTransition} from './transition.js';
 import {svg} from '../svg.js';
 
 export const fomanticMobileScreen = window.matchMedia('only screen and (max-width: 767.98px)');
diff --git a/web_src/js/modules/fomantic/modal.js b/web_src/js/fomantic/modal.js
similarity index 100%
rename from web_src/js/modules/fomantic/modal.js
rename to web_src/js/fomantic/modal.js
diff --git a/web_src/js/modules/fomantic/transition.js b/web_src/js/fomantic/transition.js
similarity index 100%
rename from web_src/js/modules/fomantic/transition.js
rename to web_src/js/fomantic/transition.js
diff --git a/web_src/js/index.js b/web_src/js/index.js
index fc2f6b9b0b919..3413692750b2b 100644
--- a/web_src/js/index.js
+++ b/web_src/js/index.js
@@ -7,20 +7,20 @@ import {initDashboardRepoList} from './components/DashboardRepoList.vue';
 
 import {initGlobalCopyToClipboardListener} from './features/clipboard.js';
 import {initContextPopups} from './features/contextpopup.js';
-import {initRepoGraphGit} from './features/repo-graph.js';
+import {initRepoGraphGit} from './repo/graph.js';
 import {initHeatmap} from './features/heatmap.js';
 import {initImageDiff} from './features/imagediff.js';
-import {initRepoMigration} from './features/repo-migration.js';
-import {initRepoProject} from './features/repo-projects.js';
+import {initRepoMigration} from './repo/migration.js';
+import {initRepoProject} from './repo/projects.js';
 import {initTableSort} from './features/tablesort.js';
 import {initAutoFocusEnd} from './features/autofocus-end.js';
-import {initAdminUserListSearchForm} from './features/admin/users.js';
-import {initAdminConfigs} from './features/admin/config.js';
+import {initAdminUserListSearchForm} from './admin/users.js';
+import {initAdminConfigs} from './admin/config.js';
 import {initMarkupAnchors} from './markup/anchors.js';
 import {initNotificationCount, initNotificationsTable} from './features/notification.js';
-import {initRepoIssueContentHistory} from './features/repo-issue-content.js';
+import {initRepoIssueContentHistory} from './repo/issue-content.js';
 import {initStopwatch} from './features/stopwatch.js';
-import {initFindFileInRepo} from './features/repo-findfile.js';
+import {initFindFileInRepo} from './repo/findfile.js';
 import {initCommentContent, initMarkupContent} from './markup/content.js';
 import {initPdfViewer} from './render/pdf.js';
 
@@ -33,8 +33,8 @@ import {
   initRepoPullRequestMergeInstruction,
   initRepoPullRequestAllowMaintainerEdit,
   initRepoPullRequestReview, initRepoIssueSidebarList, initArchivedLabelHandler,
-} from './features/repo-issue.js';
-import {initRepoEllipsisButton, initCommitStatuses} from './features/repo-commit.js';
+} from './repo/issue.js';
+import {initRepoEllipsisButton, initCommitStatuses} from './repo/commit.js';
 import {
   initFootLanguageMenu,
   initGlobalButtonClickOnEnter,
@@ -46,46 +46,46 @@ import {
   initGlobalLinkActions,
   initHeadNavbarContentToggle,
 } from './features/common-global.js';
-import {initRepoTopicBar} from './features/repo-home.js';
-import {initAdminEmails} from './features/admin/emails.js';
-import {initAdminCommon} from './features/admin/common.js';
-import {initRepoTemplateSearch} from './features/repo-template.js';
-import {initRepoCodeView} from './features/repo-code.js';
+import {initRepoTopicBar} from './repo/home.js';
+import {initAdminEmails} from './admin/emails.js';
+import {initAdminCommon} from './admin/common.js';
+import {initRepoTemplateSearch} from './repo/template.js';
+import {initRepoCodeView} from './repo/code.js';
 import {initSshKeyFormParser} from './features/sshkey-helper.js';
 import {initUserSettings} from './features/user-settings.js';
-import {initRepoArchiveLinks} from './features/repo-common.js';
-import {initRepoMigrationStatusChecker} from './features/repo-migrate.js';
+import {initRepoArchiveLinks} from './repo/common.js';
+import {initRepoMigrationStatusChecker} from './repo/migrate.js';
 import {
   initRepoSettingGitHook,
   initRepoSettingsCollaboration,
   initRepoSettingSearchTeamBox,
-} from './features/repo-settings.js';
-import {initRepoDiffView} from './features/repo-diff.js';
+} from './repo/settings.js';
+import {initRepoDiffView} from './repo/diff.js';
 import {initOrgTeamSearchRepoBox, initOrgTeamSettings} from './features/org-team.js';
 import {initUserAuthWebAuthn, initUserAuthWebAuthnRegister} from './features/user-auth-webauthn.js';
-import {initRepoRelease, initRepoReleaseNew} from './features/repo-release.js';
-import {initRepoEditor} from './features/repo-editor.js';
-import {initCompSearchUserBox} from './features/comp/SearchUserBox.js';
+import {initRepoRelease, initRepoReleaseNew} from './repo/release.js';
+import {initRepoEditor} from './repo/editor.js';
+import {initCompSearchUserBox} from './comp/SearchUserBox.js';
 import {initInstall} from './features/install.js';
-import {initCompWebHookEditor} from './features/comp/WebHookEditor.js';
-import {initRepoBranchButton} from './features/repo-branch.js';
+import {initCompWebHookEditor} from './comp/WebHookEditor.js';
+import {initRepoBranchButton} from './repo/branch.js';
 import {initCommonOrganization} from './features/common-organization.js';
-import {initRepoWikiForm} from './features/repo-wiki.js';
-import {initRepoCommentForm, initRepository} from './features/repo-legacy.js';
+import {initRepoWikiForm} from './repo/wiki.js';
+import {initRepoCommentForm, initRepository} from './repo/legacy.js';
 import {initCopyContent} from './features/copycontent.js';
 import {initCaptcha} from './features/captcha.js';
 import {initRepositoryActionView} from './components/RepoActionView.vue';
 import {initGlobalTooltips} from './modules/tippy.js';
-import {initGiteaFomantic} from './modules/fomantic.js';
+import {initGiteaFomantic} from './fomantic/index.js';
 import {onDomReady} from './utils/dom.js';
-import {initRepoIssueList} from './features/repo-issue-list.js';
+import {initRepoIssueList} from './repo/issue-list.js';
 import {initCommonIssueListQuickGoto} from './features/common-issue-list.js';
 import {initRepoContributors} from './features/contributors.js';
 import {initRepoCodeFrequency} from './features/code-frequency.js';
 import {initRepoRecentCommits} from './features/recent-commits.js';
-import {initRepoDiffCommitBranchesAndTags} from './features/repo-diff-commit.js';
+import {initRepoDiffCommitBranchesAndTags} from './repo/diff-commit.js';
 import {initDirAuto} from './modules/dirauto.js';
-import {initRepositorySearch} from './features/repo-search.js';
+import {initRepositorySearch} from './repo/search.js';
 import {initColorPickers} from './features/colorpicker.js';
 
 // Init Gitea's Fomantic settings
diff --git a/web_src/js/features/repo-branch.js b/web_src/js/repo/branch.js
similarity index 100%
rename from web_src/js/features/repo-branch.js
rename to web_src/js/repo/branch.js
diff --git a/web_src/js/features/repo-code.js b/web_src/js/repo/code.js
similarity index 99%
rename from web_src/js/features/repo-code.js
rename to web_src/js/repo/code.js
index 63da5f20392b8..b78dcba342f7c 100644
--- a/web_src/js/features/repo-code.js
+++ b/web_src/js/repo/code.js
@@ -1,6 +1,6 @@
 import $ from 'jquery';
 import {svg} from '../svg.js';
-import {invertFileFolding} from './file-fold.js';
+import {invertFileFolding} from '../features/file-fold.js';
 import {createTippy} from '../modules/tippy.js';
 import {clippie} from 'clippie';
 import {toAbsoluteUrl} from '../utils.js';
diff --git a/web_src/js/features/repo-code.test.js b/web_src/js/repo/code.test.js
similarity index 90%
rename from web_src/js/features/repo-code.test.js
rename to web_src/js/repo/code.test.js
index 0e0062a787f5d..8a03fe66743e8 100644
--- a/web_src/js/features/repo-code.test.js
+++ b/web_src/js/repo/code.test.js
@@ -1,4 +1,4 @@
-import {singleAnchorRegex, rangeAnchorRegex} from './repo-code.js';
+import {singleAnchorRegex, rangeAnchorRegex} from './code.js';
 
 test('singleAnchorRegex', () => {
   expect(singleAnchorRegex.test('#L0')).toEqual(false);
diff --git a/web_src/js/features/repo-commit.js b/web_src/js/repo/commit.js
similarity index 100%
rename from web_src/js/features/repo-commit.js
rename to web_src/js/repo/commit.js
diff --git a/web_src/js/features/repo-common.js b/web_src/js/repo/common.js
similarity index 100%
rename from web_src/js/features/repo-common.js
rename to web_src/js/repo/common.js
diff --git a/web_src/js/features/repo-diff-commit.js b/web_src/js/repo/diff-commit.js
similarity index 100%
rename from web_src/js/features/repo-diff-commit.js
rename to web_src/js/repo/diff-commit.js
diff --git a/web_src/js/features/repo-diff-commitselect.js b/web_src/js/repo/diff-commitselect.js
similarity index 100%
rename from web_src/js/features/repo-diff-commitselect.js
rename to web_src/js/repo/diff-commitselect.js
diff --git a/web_src/js/features/repo-diff-filetree.js b/web_src/js/repo/diff-filetree.js
similarity index 100%
rename from web_src/js/features/repo-diff-filetree.js
rename to web_src/js/repo/diff-filetree.js
diff --git a/web_src/js/features/repo-diff.js b/web_src/js/repo/diff.js
similarity index 94%
rename from web_src/js/features/repo-diff.js
rename to web_src/js/repo/diff.js
index 00f74515df6a8..f6c546c9aa5e6 100644
--- a/web_src/js/features/repo-diff.js
+++ b/web_src/js/repo/diff.js
@@ -1,11 +1,11 @@
 import $ from 'jquery';
-import {initCompReactionSelector} from './comp/ReactionSelector.js';
-import {initRepoIssueContentHistory} from './repo-issue-content.js';
-import {initDiffFileTree} from './repo-diff-filetree.js';
-import {initDiffCommitSelect} from './repo-diff-commitselect.js';
-import {validateTextareaNonEmpty} from './comp/ComboMarkdownEditor.js';
-import {initViewedCheckboxListenerFor, countAndUpdateViewedFiles, initExpandAndCollapseFilesButton} from './pull-view-file.js';
-import {initImageDiff} from './imagediff.js';
+import {initCompReactionSelector} from '../comp/ReactionSelector.js';
+import {initRepoIssueContentHistory} from './issue-content.js';
+import {initDiffFileTree} from './diff-filetree.js';
+import {initDiffCommitSelect} from './diff-commitselect.js';
+import {validateTextareaNonEmpty} from '../comp/ComboMarkdownEditor.js';
+import {initViewedCheckboxListenerFor, countAndUpdateViewedFiles, initExpandAndCollapseFilesButton} from '../features/pull-view-file.js';
+import {initImageDiff} from '../features/imagediff.js';
 import {showErrorToast} from '../modules/toast.js';
 import {submitEventSubmitter, queryElemSiblings, hideElem, showElem} from '../utils/dom.js';
 import {POST, GET} from '../modules/fetch.js';
diff --git a/web_src/js/features/repo-editor.js b/web_src/js/repo/editor.js
similarity index 97%
rename from web_src/js/features/repo-editor.js
rename to web_src/js/repo/editor.js
index 01dc4b95aaa47..be866d3cfc6bc 100644
--- a/web_src/js/features/repo-editor.js
+++ b/web_src/js/repo/editor.js
@@ -1,9 +1,9 @@
 import $ from 'jquery';
 import {htmlEscape} from 'escape-goat';
-import {createCodeEditor} from './codeeditor.js';
+import {createCodeEditor} from '../features/codeeditor.js';
 import {hideElem, showElem} from '../utils/dom.js';
 import {initMarkupContent} from '../markup/content.js';
-import {attachRefIssueContextPopup} from './contextpopup.js';
+import {attachRefIssueContextPopup} from '../features/contextpopup.js';
 import {POST} from '../modules/fetch.js';
 
 function initEditPreviewTab($form) {
diff --git a/web_src/js/features/repo-findfile.js b/web_src/js/repo/findfile.js
similarity index 100%
rename from web_src/js/features/repo-findfile.js
rename to web_src/js/repo/findfile.js
diff --git a/web_src/js/features/repo-findfile.test.js b/web_src/js/repo/findfile.test.js
similarity index 98%
rename from web_src/js/features/repo-findfile.test.js
rename to web_src/js/repo/findfile.test.js
index 2d96ed4463ee1..4c21dc81b8713 100644
--- a/web_src/js/features/repo-findfile.test.js
+++ b/web_src/js/repo/findfile.test.js
@@ -1,4 +1,4 @@
-import {strSubMatch, calcMatchedWeight, filterRepoFilesWeighted} from './repo-findfile.js';
+import {strSubMatch, calcMatchedWeight, filterRepoFilesWeighted} from './findfile.js';
 
 describe('Repo Find Files', () => {
   test('strSubMatch', () => {
diff --git a/web_src/js/features/repo-graph.js b/web_src/js/repo/graph.js
similarity index 100%
rename from web_src/js/features/repo-graph.js
rename to web_src/js/repo/graph.js
diff --git a/web_src/js/features/repo-home.js b/web_src/js/repo/home.js
similarity index 100%
rename from web_src/js/features/repo-home.js
rename to web_src/js/repo/home.js
diff --git a/web_src/js/features/repo-issue-content.js b/web_src/js/repo/issue-content.js
similarity index 100%
rename from web_src/js/features/repo-issue-content.js
rename to web_src/js/repo/issue-content.js
diff --git a/web_src/js/features/repo-issue-edit.js b/web_src/js/repo/issue-edit.js
similarity index 97%
rename from web_src/js/features/repo-issue-edit.js
rename to web_src/js/repo/issue-edit.js
index 4c03325c7a5f6..6088d0f7a2532 100644
--- a/web_src/js/features/repo-issue-edit.js
+++ b/web_src/js/repo/issue-edit.js
@@ -1,10 +1,10 @@
 import $ from 'jquery';
-import {handleReply} from './repo-issue.js';
-import {getComboMarkdownEditor, initComboMarkdownEditor} from './comp/ComboMarkdownEditor.js';
-import {createDropzone} from './dropzone.js';
+import {handleReply} from './issue.js';
+import {getComboMarkdownEditor, initComboMarkdownEditor} from '../comp/ComboMarkdownEditor.js';
+import {createDropzone} from '../features/dropzone.js';
 import {GET, POST} from '../modules/fetch.js';
 import {hideElem, showElem} from '../utils/dom.js';
-import {attachRefIssueContextPopup} from './contextpopup.js';
+import {attachRefIssueContextPopup} from '../features/contextpopup.js';
 import {initCommentContent, initMarkupContent} from '../markup/content.js';
 
 const {csrfToken} = window.config;
diff --git a/web_src/js/features/repo-issue-list.js b/web_src/js/repo/issue-list.js
similarity index 98%
rename from web_src/js/features/repo-issue-list.js
rename to web_src/js/repo/issue-list.js
index 92f058c4d20e1..5d2c1cde85893 100644
--- a/web_src/js/features/repo-issue-list.js
+++ b/web_src/js/repo/issue-list.js
@@ -1,8 +1,8 @@
 import $ from 'jquery';
-import {updateIssuesMeta} from './repo-issue.js';
+import {updateIssuesMeta} from './issue.js';
 import {toggleElem, hideElem, isElemHidden} from '../utils/dom.js';
 import {htmlEscape} from 'escape-goat';
-import {confirmModal} from './comp/ConfirmModal.js';
+import {confirmModal} from '../comp/ConfirmModal.js';
 import {showErrorToast} from '../modules/toast.js';
 import {createSortable} from '../modules/sortable.js';
 import {DELETE, POST} from '../modules/fetch.js';
diff --git a/web_src/js/features/repo-issue-pr-form.js b/web_src/js/repo/issue-pr-form.js
similarity index 100%
rename from web_src/js/features/repo-issue-pr-form.js
rename to web_src/js/repo/issue-pr-form.js
diff --git a/web_src/js/features/repo-issue-pr-status.js b/web_src/js/repo/issue-pr-status.js
similarity index 100%
rename from web_src/js/features/repo-issue-pr-status.js
rename to web_src/js/repo/issue-pr-status.js
diff --git a/web_src/js/features/repo-issue.js b/web_src/js/repo/issue.js
similarity index 99%
rename from web_src/js/features/repo-issue.js
rename to web_src/js/repo/issue.js
index 2b2eed58bbfb3..4701d49427469 100644
--- a/web_src/js/features/repo-issue.js
+++ b/web_src/js/repo/issue.js
@@ -2,10 +2,10 @@ import $ from 'jquery';
 import {htmlEscape} from 'escape-goat';
 import {showTemporaryTooltip, createTippy} from '../modules/tippy.js';
 import {hideElem, showElem, toggleElem} from '../utils/dom.js';
-import {setFileFolding} from './file-fold.js';
-import {getComboMarkdownEditor, initComboMarkdownEditor} from './comp/ComboMarkdownEditor.js';
+import {setFileFolding} from '../features/file-fold.js';
+import {getComboMarkdownEditor, initComboMarkdownEditor} from '../comp/ComboMarkdownEditor.js';
 import {toAbsoluteUrl} from '../utils.js';
-import {initDropzone} from './common-global.js';
+import {initDropzone} from '../features/common-global.js';
 import {POST, GET} from '../modules/fetch.js';
 
 const {appSubUrl} = window.config;
diff --git a/web_src/js/features/repo-legacy.js b/web_src/js/repo/legacy.js
similarity index 95%
rename from web_src/js/features/repo-legacy.js
rename to web_src/js/repo/legacy.js
index 18d98c891d066..f5bc982300cdb 100644
--- a/web_src/js/features/repo-legacy.js
+++ b/web_src/js/repo/legacy.js
@@ -4,24 +4,24 @@ import {
   initRepoIssueComments, initRepoIssueDependencyDelete, initRepoIssueReferenceIssue,
   initRepoIssueTitleEdit, initRepoIssueWipToggle,
   initRepoPullRequestUpdate, updateIssuesMeta, initIssueTemplateCommentEditors, initSingleCommentEditor,
-} from './repo-issue.js';
-import {initUnicodeEscapeButton} from './repo-unicode-escape.js';
+} from './issue.js';
+import {initUnicodeEscapeButton} from './unicode-escape.js';
 import {svg} from '../svg.js';
 import {htmlEscape} from 'escape-goat';
 import {initRepoBranchTagSelector} from '../components/RepoBranchTagSelector.vue';
 import {
   initRepoCloneLink, initRepoCommonBranchOrTagDropdown, initRepoCommonFilterSearchDropdown,
-} from './repo-common.js';
-import {initCitationFileCopyContent} from './citation.js';
-import {initCompLabelEdit} from './comp/LabelEdit.js';
-import {initRepoDiffConversationNav} from './repo-diff.js';
-import {initCompReactionSelector} from './comp/ReactionSelector.js';
-import {initRepoSettingBranches} from './repo-settings.js';
-import {initRepoPullRequestMergeForm} from './repo-issue-pr-form.js';
-import {initRepoPullRequestCommitStatus} from './repo-issue-pr-status.js';
+} from './common.js';
+import {initCitationFileCopyContent} from '../features/citation.js';
+import {initCompLabelEdit} from '../comp/LabelEdit.js';
+import {initRepoDiffConversationNav} from './diff.js';
+import {initCompReactionSelector} from '../comp/ReactionSelector.js';
+import {initRepoSettingBranches} from './settings.js';
+import {initRepoPullRequestMergeForm} from './issue-pr-form.js';
+import {initRepoPullRequestCommitStatus} from './issue-pr-status.js';
 import {hideElem, showElem} from '../utils/dom.js';
 import {POST} from '../modules/fetch.js';
-import {initRepoIssueCommentEdit} from './repo-issue-edit.js';
+import {initRepoIssueCommentEdit} from './issue-edit.js';
 
 // if there are draft comments, confirm before reloading, to avoid losing comments
 function reloadConfirmDraftComment() {
diff --git a/web_src/js/features/repo-migrate.js b/web_src/js/repo/migrate.js
similarity index 100%
rename from web_src/js/features/repo-migrate.js
rename to web_src/js/repo/migrate.js
diff --git a/web_src/js/features/repo-migration.js b/web_src/js/repo/migration.js
similarity index 100%
rename from web_src/js/features/repo-migration.js
rename to web_src/js/repo/migration.js
diff --git a/web_src/js/features/repo-projects.js b/web_src/js/repo/projects.js
similarity index 100%
rename from web_src/js/features/repo-projects.js
rename to web_src/js/repo/projects.js
diff --git a/web_src/js/features/repo-release.js b/web_src/js/repo/release.js
similarity index 96%
rename from web_src/js/features/repo-release.js
rename to web_src/js/repo/release.js
index f3cfa7441815b..6d18e10246025 100644
--- a/web_src/js/features/repo-release.js
+++ b/web_src/js/repo/release.js
@@ -1,5 +1,5 @@
 import {hideElem, showElem} from '../utils/dom.js';
-import {initComboMarkdownEditor} from './comp/ComboMarkdownEditor.js';
+import {initComboMarkdownEditor} from '../comp/ComboMarkdownEditor.js';
 
 export function initRepoRelease() {
   document.addEventListener('click', (e) => {
diff --git a/web_src/js/features/repo-search.js b/web_src/js/repo/search.js
similarity index 100%
rename from web_src/js/features/repo-search.js
rename to web_src/js/repo/search.js
diff --git a/web_src/js/features/repo-settings.js b/web_src/js/repo/settings.js
similarity index 98%
rename from web_src/js/features/repo-settings.js
rename to web_src/js/repo/settings.js
index 52c5de2bfaea2..e67ddba005169 100644
--- a/web_src/js/features/repo-settings.js
+++ b/web_src/js/repo/settings.js
@@ -1,6 +1,6 @@
 import $ from 'jquery';
 import {minimatch} from 'minimatch';
-import {createMonaco} from './codeeditor.js';
+import {createMonaco} from '../features/codeeditor.js';
 import {onInputDebounce, toggleElem} from '../utils/dom.js';
 import {POST} from '../modules/fetch.js';
 
diff --git a/web_src/js/features/repo-template.js b/web_src/js/repo/template.js
similarity index 100%
rename from web_src/js/features/repo-template.js
rename to web_src/js/repo/template.js
diff --git a/web_src/js/features/repo-unicode-escape.js b/web_src/js/repo/unicode-escape.js
similarity index 100%
rename from web_src/js/features/repo-unicode-escape.js
rename to web_src/js/repo/unicode-escape.js
diff --git a/web_src/js/features/repo-wiki.js b/web_src/js/repo/wiki.js
similarity index 97%
rename from web_src/js/features/repo-wiki.js
rename to web_src/js/repo/wiki.js
index 03a2c68c5a973..c2b9958eb61b4 100644
--- a/web_src/js/features/repo-wiki.js
+++ b/web_src/js/repo/wiki.js
@@ -1,6 +1,6 @@
 import {initMarkupContent} from '../markup/content.js';
-import {validateTextareaNonEmpty, initComboMarkdownEditor} from './comp/ComboMarkdownEditor.js';
-import {fomanticMobileScreen} from '../modules/fomantic.js';
+import {validateTextareaNonEmpty, initComboMarkdownEditor} from '../comp/ComboMarkdownEditor.js';
+import {fomanticMobileScreen} from '../fomantic/index.js';
 import {POST} from '../modules/fetch.js';
 
 async function initRepoWikiFormEditor() {