diff --git a/app/assets/javascripts/admin/adapters/api-key.js.es6 b/app/assets/javascripts/admin/adapters/api-key.js
similarity index 100%
rename from app/assets/javascripts/admin/adapters/api-key.js.es6
rename to app/assets/javascripts/admin/adapters/api-key.js
diff --git a/app/assets/javascripts/admin/adapters/build-plugin.js.es6 b/app/assets/javascripts/admin/adapters/build-plugin.js
similarity index 100%
rename from app/assets/javascripts/admin/adapters/build-plugin.js.es6
rename to app/assets/javascripts/admin/adapters/build-plugin.js
diff --git a/app/assets/javascripts/admin/adapters/customization-base.js.es6 b/app/assets/javascripts/admin/adapters/customization-base.js
similarity index 100%
rename from app/assets/javascripts/admin/adapters/customization-base.js.es6
rename to app/assets/javascripts/admin/adapters/customization-base.js
diff --git a/app/assets/javascripts/admin/adapters/email-style.js.es6 b/app/assets/javascripts/admin/adapters/email-style.js
similarity index 100%
rename from app/assets/javascripts/admin/adapters/email-style.js.es6
rename to app/assets/javascripts/admin/adapters/email-style.js
diff --git a/app/assets/javascripts/admin/adapters/embedding.js.es6 b/app/assets/javascripts/admin/adapters/embedding.js
similarity index 100%
rename from app/assets/javascripts/admin/adapters/embedding.js.es6
rename to app/assets/javascripts/admin/adapters/embedding.js
diff --git a/app/assets/javascripts/admin/adapters/site-text.js.es6 b/app/assets/javascripts/admin/adapters/site-text.js
similarity index 100%
rename from app/assets/javascripts/admin/adapters/site-text.js.es6
rename to app/assets/javascripts/admin/adapters/site-text.js
diff --git a/app/assets/javascripts/admin/adapters/staff-action-log.js.es6 b/app/assets/javascripts/admin/adapters/staff-action-log.js
similarity index 100%
rename from app/assets/javascripts/admin/adapters/staff-action-log.js.es6
rename to app/assets/javascripts/admin/adapters/staff-action-log.js
diff --git a/app/assets/javascripts/admin/adapters/tag-group.js.es6 b/app/assets/javascripts/admin/adapters/tag-group.js
similarity index 100%
rename from app/assets/javascripts/admin/adapters/tag-group.js.es6
rename to app/assets/javascripts/admin/adapters/tag-group.js
diff --git a/app/assets/javascripts/admin/adapters/theme.js.es6 b/app/assets/javascripts/admin/adapters/theme.js
similarity index 100%
rename from app/assets/javascripts/admin/adapters/theme.js.es6
rename to app/assets/javascripts/admin/adapters/theme.js
diff --git a/app/assets/javascripts/admin/adapters/user-field.js.es6 b/app/assets/javascripts/admin/adapters/user-field.js
similarity index 100%
rename from app/assets/javascripts/admin/adapters/user-field.js.es6
rename to app/assets/javascripts/admin/adapters/user-field.js
diff --git a/app/assets/javascripts/admin/adapters/web-hook-event.js.es6 b/app/assets/javascripts/admin/adapters/web-hook-event.js
similarity index 100%
rename from app/assets/javascripts/admin/adapters/web-hook-event.js.es6
rename to app/assets/javascripts/admin/adapters/web-hook-event.js
diff --git a/app/assets/javascripts/admin/adapters/web-hook.js.es6 b/app/assets/javascripts/admin/adapters/web-hook.js
similarity index 100%
rename from app/assets/javascripts/admin/adapters/web-hook.js.es6
rename to app/assets/javascripts/admin/adapters/web-hook.js
diff --git a/app/assets/javascripts/admin/components/ace-editor.js.es6 b/app/assets/javascripts/admin/components/ace-editor.js
similarity index 100%
rename from app/assets/javascripts/admin/components/ace-editor.js.es6
rename to app/assets/javascripts/admin/components/ace-editor.js
diff --git a/app/assets/javascripts/admin/components/admin-backups-logs.js.es6 b/app/assets/javascripts/admin/components/admin-backups-logs.js
similarity index 100%
rename from app/assets/javascripts/admin/components/admin-backups-logs.js.es6
rename to app/assets/javascripts/admin/components/admin-backups-logs.js
diff --git a/app/assets/javascripts/admin/components/admin-directory-toggle.js.es6 b/app/assets/javascripts/admin/components/admin-directory-toggle.js
similarity index 100%
rename from app/assets/javascripts/admin/components/admin-directory-toggle.js.es6
rename to app/assets/javascripts/admin/components/admin-directory-toggle.js
diff --git a/app/assets/javascripts/admin/components/admin-editable-field.js.es6 b/app/assets/javascripts/admin/components/admin-editable-field.js
similarity index 100%
rename from app/assets/javascripts/admin/components/admin-editable-field.js.es6
rename to app/assets/javascripts/admin/components/admin-editable-field.js
diff --git a/app/assets/javascripts/admin/components/admin-form-row.js.es6 b/app/assets/javascripts/admin/components/admin-form-row.js
similarity index 100%
rename from app/assets/javascripts/admin/components/admin-form-row.js.es6
rename to app/assets/javascripts/admin/components/admin-form-row.js
diff --git a/app/assets/javascripts/admin/components/admin-graph.js.es6 b/app/assets/javascripts/admin/components/admin-graph.js
similarity index 100%
rename from app/assets/javascripts/admin/components/admin-graph.js.es6
rename to app/assets/javascripts/admin/components/admin-graph.js
diff --git a/app/assets/javascripts/admin/components/admin-nav.js.es6 b/app/assets/javascripts/admin/components/admin-nav.js
similarity index 100%
rename from app/assets/javascripts/admin/components/admin-nav.js.es6
rename to app/assets/javascripts/admin/components/admin-nav.js
diff --git a/app/assets/javascripts/admin/components/admin-report-chart.js.es6 b/app/assets/javascripts/admin/components/admin-report-chart.js
similarity index 100%
rename from app/assets/javascripts/admin/components/admin-report-chart.js.es6
rename to app/assets/javascripts/admin/components/admin-report-chart.js
diff --git a/app/assets/javascripts/admin/components/admin-report-counters.js.es6 b/app/assets/javascripts/admin/components/admin-report-counters.js
similarity index 100%
rename from app/assets/javascripts/admin/components/admin-report-counters.js.es6
rename to app/assets/javascripts/admin/components/admin-report-counters.js
diff --git a/app/assets/javascripts/admin/components/admin-report-counts.js.es6 b/app/assets/javascripts/admin/components/admin-report-counts.js
similarity index 100%
rename from app/assets/javascripts/admin/components/admin-report-counts.js.es6
rename to app/assets/javascripts/admin/components/admin-report-counts.js
diff --git a/app/assets/javascripts/admin/components/admin-report-inline-table.js.es6 b/app/assets/javascripts/admin/components/admin-report-inline-table.js
similarity index 100%
rename from app/assets/javascripts/admin/components/admin-report-inline-table.js.es6
rename to app/assets/javascripts/admin/components/admin-report-inline-table.js
diff --git a/app/assets/javascripts/admin/components/admin-report-per-day-counts.js.es6 b/app/assets/javascripts/admin/components/admin-report-per-day-counts.js
similarity index 100%
rename from app/assets/javascripts/admin/components/admin-report-per-day-counts.js.es6
rename to app/assets/javascripts/admin/components/admin-report-per-day-counts.js
diff --git a/app/assets/javascripts/admin/components/admin-report-stacked-chart.js.es6 b/app/assets/javascripts/admin/components/admin-report-stacked-chart.js
similarity index 100%
rename from app/assets/javascripts/admin/components/admin-report-stacked-chart.js.es6
rename to app/assets/javascripts/admin/components/admin-report-stacked-chart.js
diff --git a/app/assets/javascripts/admin/components/admin-report-storage-stats.js.es6 b/app/assets/javascripts/admin/components/admin-report-storage-stats.js
similarity index 100%
rename from app/assets/javascripts/admin/components/admin-report-storage-stats.js.es6
rename to app/assets/javascripts/admin/components/admin-report-storage-stats.js
diff --git a/app/assets/javascripts/admin/components/admin-report-table-cell.js.es6 b/app/assets/javascripts/admin/components/admin-report-table-cell.js
similarity index 100%
rename from app/assets/javascripts/admin/components/admin-report-table-cell.js.es6
rename to app/assets/javascripts/admin/components/admin-report-table-cell.js
diff --git a/app/assets/javascripts/admin/components/admin-report-table-header.js.es6 b/app/assets/javascripts/admin/components/admin-report-table-header.js
similarity index 100%
rename from app/assets/javascripts/admin/components/admin-report-table-header.js.es6
rename to app/assets/javascripts/admin/components/admin-report-table-header.js
diff --git a/app/assets/javascripts/admin/components/admin-report-table-row.js.es6 b/app/assets/javascripts/admin/components/admin-report-table-row.js
similarity index 100%
rename from app/assets/javascripts/admin/components/admin-report-table-row.js.es6
rename to app/assets/javascripts/admin/components/admin-report-table-row.js
diff --git a/app/assets/javascripts/admin/components/admin-report-table.js.es6 b/app/assets/javascripts/admin/components/admin-report-table.js
similarity index 100%
rename from app/assets/javascripts/admin/components/admin-report-table.js.es6
rename to app/assets/javascripts/admin/components/admin-report-table.js
diff --git a/app/assets/javascripts/admin/components/admin-report-trust-level-counts.js.es6 b/app/assets/javascripts/admin/components/admin-report-trust-level-counts.js
similarity index 100%
rename from app/assets/javascripts/admin/components/admin-report-trust-level-counts.js.es6
rename to app/assets/javascripts/admin/components/admin-report-trust-level-counts.js
diff --git a/app/assets/javascripts/admin/components/admin-report.js.es6 b/app/assets/javascripts/admin/components/admin-report.js
similarity index 100%
rename from app/assets/javascripts/admin/components/admin-report.js.es6
rename to app/assets/javascripts/admin/components/admin-report.js
diff --git a/app/assets/javascripts/admin/components/admin-theme-editor.js.es6 b/app/assets/javascripts/admin/components/admin-theme-editor.js
similarity index 100%
rename from app/assets/javascripts/admin/components/admin-theme-editor.js.es6
rename to app/assets/javascripts/admin/components/admin-theme-editor.js
diff --git a/app/assets/javascripts/admin/components/admin-user-field-item.js.es6 b/app/assets/javascripts/admin/components/admin-user-field-item.js
similarity index 100%
rename from app/assets/javascripts/admin/components/admin-user-field-item.js.es6
rename to app/assets/javascripts/admin/components/admin-user-field-item.js
diff --git a/app/assets/javascripts/admin/components/admin-watched-word.js.es6 b/app/assets/javascripts/admin/components/admin-watched-word.js
similarity index 100%
rename from app/assets/javascripts/admin/components/admin-watched-word.js.es6
rename to app/assets/javascripts/admin/components/admin-watched-word.js
diff --git a/app/assets/javascripts/admin/components/admin-web-hook-event-chooser.js.es6 b/app/assets/javascripts/admin/components/admin-web-hook-event-chooser.js
similarity index 100%
rename from app/assets/javascripts/admin/components/admin-web-hook-event-chooser.js.es6
rename to app/assets/javascripts/admin/components/admin-web-hook-event-chooser.js
diff --git a/app/assets/javascripts/admin/components/admin-web-hook-event.js.es6 b/app/assets/javascripts/admin/components/admin-web-hook-event.js
similarity index 100%
rename from app/assets/javascripts/admin/components/admin-web-hook-event.js.es6
rename to app/assets/javascripts/admin/components/admin-web-hook-event.js
diff --git a/app/assets/javascripts/admin/components/admin-web-hook-status.js.es6 b/app/assets/javascripts/admin/components/admin-web-hook-status.js
similarity index 100%
rename from app/assets/javascripts/admin/components/admin-web-hook-status.js.es6
rename to app/assets/javascripts/admin/components/admin-web-hook-status.js
diff --git a/app/assets/javascripts/admin/components/admin-wrapper.js.es6 b/app/assets/javascripts/admin/components/admin-wrapper.js
similarity index 100%
rename from app/assets/javascripts/admin/components/admin-wrapper.js.es6
rename to app/assets/javascripts/admin/components/admin-wrapper.js
diff --git a/app/assets/javascripts/admin/components/cancel-link.js.es6 b/app/assets/javascripts/admin/components/cancel-link.js
similarity index 100%
rename from app/assets/javascripts/admin/components/cancel-link.js.es6
rename to app/assets/javascripts/admin/components/cancel-link.js
diff --git a/app/assets/javascripts/admin/components/color-input.js.es6 b/app/assets/javascripts/admin/components/color-input.js
similarity index 100%
rename from app/assets/javascripts/admin/components/color-input.js.es6
rename to app/assets/javascripts/admin/components/color-input.js
diff --git a/app/assets/javascripts/admin/components/email-styles-editor.js.es6 b/app/assets/javascripts/admin/components/email-styles-editor.js
similarity index 100%
rename from app/assets/javascripts/admin/components/email-styles-editor.js.es6
rename to app/assets/javascripts/admin/components/email-styles-editor.js
diff --git a/app/assets/javascripts/admin/components/embeddable-host.js.es6 b/app/assets/javascripts/admin/components/embeddable-host.js
similarity index 100%
rename from app/assets/javascripts/admin/components/embeddable-host.js.es6
rename to app/assets/javascripts/admin/components/embeddable-host.js
diff --git a/app/assets/javascripts/admin/components/embedding-setting.js.es6 b/app/assets/javascripts/admin/components/embedding-setting.js
similarity index 100%
rename from app/assets/javascripts/admin/components/embedding-setting.js.es6
rename to app/assets/javascripts/admin/components/embedding-setting.js
diff --git a/app/assets/javascripts/admin/components/flag-user-lists.js.es6 b/app/assets/javascripts/admin/components/flag-user-lists.js
similarity index 100%
rename from app/assets/javascripts/admin/components/flag-user-lists.js.es6
rename to app/assets/javascripts/admin/components/flag-user-lists.js
diff --git a/app/assets/javascripts/admin/components/highlighted-code.js.es6 b/app/assets/javascripts/admin/components/highlighted-code.js
similarity index 100%
rename from app/assets/javascripts/admin/components/highlighted-code.js.es6
rename to app/assets/javascripts/admin/components/highlighted-code.js
diff --git a/app/assets/javascripts/admin/components/inline-edit-checkbox.js.es6 b/app/assets/javascripts/admin/components/inline-edit-checkbox.js
similarity index 100%
rename from app/assets/javascripts/admin/components/inline-edit-checkbox.js.es6
rename to app/assets/javascripts/admin/components/inline-edit-checkbox.js
diff --git a/app/assets/javascripts/admin/components/install-theme-item.js.es6 b/app/assets/javascripts/admin/components/install-theme-item.js
similarity index 100%
rename from app/assets/javascripts/admin/components/install-theme-item.js.es6
rename to app/assets/javascripts/admin/components/install-theme-item.js
diff --git a/app/assets/javascripts/admin/components/ip-lookup.js.es6 b/app/assets/javascripts/admin/components/ip-lookup.js
similarity index 100%
rename from app/assets/javascripts/admin/components/ip-lookup.js.es6
rename to app/assets/javascripts/admin/components/ip-lookup.js
diff --git a/app/assets/javascripts/admin/components/moderation-history-item.js.es6 b/app/assets/javascripts/admin/components/moderation-history-item.js
similarity index 100%
rename from app/assets/javascripts/admin/components/moderation-history-item.js.es6
rename to app/assets/javascripts/admin/components/moderation-history-item.js
diff --git a/app/assets/javascripts/admin/components/penalty-post-action.js.es6 b/app/assets/javascripts/admin/components/penalty-post-action.js
similarity index 100%
rename from app/assets/javascripts/admin/components/penalty-post-action.js.es6
rename to app/assets/javascripts/admin/components/penalty-post-action.js
diff --git a/app/assets/javascripts/admin/components/permalink-form.js.es6 b/app/assets/javascripts/admin/components/permalink-form.js
similarity index 100%
rename from app/assets/javascripts/admin/components/permalink-form.js.es6
rename to app/assets/javascripts/admin/components/permalink-form.js
diff --git a/app/assets/javascripts/admin/components/report-filters/category.js.es6 b/app/assets/javascripts/admin/components/report-filters/category.js
similarity index 100%
rename from app/assets/javascripts/admin/components/report-filters/category.js.es6
rename to app/assets/javascripts/admin/components/report-filters/category.js
diff --git a/app/assets/javascripts/admin/components/report-filters/file-extension.js.es6 b/app/assets/javascripts/admin/components/report-filters/file-extension.js
similarity index 100%
rename from app/assets/javascripts/admin/components/report-filters/file-extension.js.es6
rename to app/assets/javascripts/admin/components/report-filters/file-extension.js
diff --git a/app/assets/javascripts/admin/components/report-filters/filter.js.es6 b/app/assets/javascripts/admin/components/report-filters/filter.js
similarity index 100%
rename from app/assets/javascripts/admin/components/report-filters/filter.js.es6
rename to app/assets/javascripts/admin/components/report-filters/filter.js
diff --git a/app/assets/javascripts/admin/components/report-filters/group.js.es6 b/app/assets/javascripts/admin/components/report-filters/group.js
similarity index 100%
rename from app/assets/javascripts/admin/components/report-filters/group.js.es6
rename to app/assets/javascripts/admin/components/report-filters/group.js
diff --git a/app/assets/javascripts/admin/components/resumable-upload.js.es6 b/app/assets/javascripts/admin/components/resumable-upload.js
similarity index 100%
rename from app/assets/javascripts/admin/components/resumable-upload.js.es6
rename to app/assets/javascripts/admin/components/resumable-upload.js
diff --git a/app/assets/javascripts/admin/components/screened-ip-address-form.js.es6 b/app/assets/javascripts/admin/components/screened-ip-address-form.js
similarity index 100%
rename from app/assets/javascripts/admin/components/screened-ip-address-form.js.es6
rename to app/assets/javascripts/admin/components/screened-ip-address-form.js
diff --git a/app/assets/javascripts/admin/components/secret-value-list.js.es6 b/app/assets/javascripts/admin/components/secret-value-list.js
similarity index 100%
rename from app/assets/javascripts/admin/components/secret-value-list.js.es6
rename to app/assets/javascripts/admin/components/secret-value-list.js
diff --git a/app/assets/javascripts/admin/components/silence-details.js.es6 b/app/assets/javascripts/admin/components/silence-details.js
similarity index 100%
rename from app/assets/javascripts/admin/components/silence-details.js.es6
rename to app/assets/javascripts/admin/components/silence-details.js
diff --git a/app/assets/javascripts/admin/components/site-setting.js.es6 b/app/assets/javascripts/admin/components/site-setting.js
similarity index 100%
rename from app/assets/javascripts/admin/components/site-setting.js.es6
rename to app/assets/javascripts/admin/components/site-setting.js
diff --git a/app/assets/javascripts/admin/components/site-settings-image-uploader.js.es6 b/app/assets/javascripts/admin/components/site-settings-image-uploader.js
similarity index 100%
rename from app/assets/javascripts/admin/components/site-settings-image-uploader.js.es6
rename to app/assets/javascripts/admin/components/site-settings-image-uploader.js
diff --git a/app/assets/javascripts/admin/components/site-settings/bool.js.es6 b/app/assets/javascripts/admin/components/site-settings/bool.js
similarity index 100%
rename from app/assets/javascripts/admin/components/site-settings/bool.js.es6
rename to app/assets/javascripts/admin/components/site-settings/bool.js
diff --git a/app/assets/javascripts/admin/components/site-settings/category-list.js.es6 b/app/assets/javascripts/admin/components/site-settings/category-list.js
similarity index 100%
rename from app/assets/javascripts/admin/components/site-settings/category-list.js.es6
rename to app/assets/javascripts/admin/components/site-settings/category-list.js
diff --git a/app/assets/javascripts/admin/components/site-settings/color.js.es6 b/app/assets/javascripts/admin/components/site-settings/color.js
similarity index 100%
rename from app/assets/javascripts/admin/components/site-settings/color.js.es6
rename to app/assets/javascripts/admin/components/site-settings/color.js
diff --git a/app/assets/javascripts/admin/components/site-settings/compact-list.js.es6 b/app/assets/javascripts/admin/components/site-settings/compact-list.js
similarity index 100%
rename from app/assets/javascripts/admin/components/site-settings/compact-list.js.es6
rename to app/assets/javascripts/admin/components/site-settings/compact-list.js
diff --git a/app/assets/javascripts/admin/components/site-settings/group-list.js.es6 b/app/assets/javascripts/admin/components/site-settings/group-list.js
similarity index 100%
rename from app/assets/javascripts/admin/components/site-settings/group-list.js.es6
rename to app/assets/javascripts/admin/components/site-settings/group-list.js
diff --git a/app/assets/javascripts/admin/components/site-settings/tag-list.js.es6 b/app/assets/javascripts/admin/components/site-settings/tag-list.js
similarity index 100%
rename from app/assets/javascripts/admin/components/site-settings/tag-list.js.es6
rename to app/assets/javascripts/admin/components/site-settings/tag-list.js
diff --git a/app/assets/javascripts/admin/components/site-settings/uploaded-image-list.js.es6 b/app/assets/javascripts/admin/components/site-settings/uploaded-image-list.js
similarity index 100%
rename from app/assets/javascripts/admin/components/site-settings/uploaded-image-list.js.es6
rename to app/assets/javascripts/admin/components/site-settings/uploaded-image-list.js
diff --git a/app/assets/javascripts/admin/components/site-text-summary.js.es6 b/app/assets/javascripts/admin/components/site-text-summary.js
similarity index 100%
rename from app/assets/javascripts/admin/components/site-text-summary.js.es6
rename to app/assets/javascripts/admin/components/site-text-summary.js
diff --git a/app/assets/javascripts/admin/components/staff-actions.js.es6 b/app/assets/javascripts/admin/components/staff-actions.js
similarity index 100%
rename from app/assets/javascripts/admin/components/staff-actions.js.es6
rename to app/assets/javascripts/admin/components/staff-actions.js
diff --git a/app/assets/javascripts/admin/components/suspension-details.js.es6 b/app/assets/javascripts/admin/components/suspension-details.js
similarity index 100%
rename from app/assets/javascripts/admin/components/suspension-details.js.es6
rename to app/assets/javascripts/admin/components/suspension-details.js
diff --git a/app/assets/javascripts/admin/components/tags-uploader.js.es6 b/app/assets/javascripts/admin/components/tags-uploader.js
similarity index 100%
rename from app/assets/javascripts/admin/components/tags-uploader.js.es6
rename to app/assets/javascripts/admin/components/tags-uploader.js
diff --git a/app/assets/javascripts/admin/components/theme-setting-editor.js.es6 b/app/assets/javascripts/admin/components/theme-setting-editor.js
similarity index 100%
rename from app/assets/javascripts/admin/components/theme-setting-editor.js.es6
rename to app/assets/javascripts/admin/components/theme-setting-editor.js
diff --git a/app/assets/javascripts/admin/components/theme-setting-relatives-selector.js.es6 b/app/assets/javascripts/admin/components/theme-setting-relatives-selector.js
similarity index 100%
rename from app/assets/javascripts/admin/components/theme-setting-relatives-selector.js.es6
rename to app/assets/javascripts/admin/components/theme-setting-relatives-selector.js
diff --git a/app/assets/javascripts/admin/components/theme-translation.js.es6 b/app/assets/javascripts/admin/components/theme-translation.js
similarity index 100%
rename from app/assets/javascripts/admin/components/theme-translation.js.es6
rename to app/assets/javascripts/admin/components/theme-translation.js
diff --git a/app/assets/javascripts/admin/components/themes-list-item.js.es6 b/app/assets/javascripts/admin/components/themes-list-item.js
similarity index 100%
rename from app/assets/javascripts/admin/components/themes-list-item.js.es6
rename to app/assets/javascripts/admin/components/themes-list-item.js
diff --git a/app/assets/javascripts/admin/components/themes-list.js.es6 b/app/assets/javascripts/admin/components/themes-list.js
similarity index 100%
rename from app/assets/javascripts/admin/components/themes-list.js.es6
rename to app/assets/javascripts/admin/components/themes-list.js
diff --git a/app/assets/javascripts/admin/components/value-list.js.es6 b/app/assets/javascripts/admin/components/value-list.js
similarity index 100%
rename from app/assets/javascripts/admin/components/value-list.js.es6
rename to app/assets/javascripts/admin/components/value-list.js
diff --git a/app/assets/javascripts/admin/components/watched-word-form.js.es6 b/app/assets/javascripts/admin/components/watched-word-form.js
similarity index 100%
rename from app/assets/javascripts/admin/components/watched-word-form.js.es6
rename to app/assets/javascripts/admin/components/watched-word-form.js
diff --git a/app/assets/javascripts/admin/components/watched-word-uploader.js.es6 b/app/assets/javascripts/admin/components/watched-word-uploader.js
similarity index 100%
rename from app/assets/javascripts/admin/components/watched-word-uploader.js.es6
rename to app/assets/javascripts/admin/components/watched-word-uploader.js
diff --git a/app/assets/javascripts/admin/controllers/admin-api-keys-index.js.es6 b/app/assets/javascripts/admin/controllers/admin-api-keys-index.js
similarity index 100%
rename from app/assets/javascripts/admin/controllers/admin-api-keys-index.js.es6
rename to app/assets/javascripts/admin/controllers/admin-api-keys-index.js
diff --git a/app/assets/javascripts/admin/controllers/admin-api-keys-new.js.es6 b/app/assets/javascripts/admin/controllers/admin-api-keys-new.js
similarity index 100%
rename from app/assets/javascripts/admin/controllers/admin-api-keys-new.js.es6
rename to app/assets/javascripts/admin/controllers/admin-api-keys-new.js
diff --git a/app/assets/javascripts/admin/controllers/admin-api-keys-show.js.es6 b/app/assets/javascripts/admin/controllers/admin-api-keys-show.js
similarity index 100%
rename from app/assets/javascripts/admin/controllers/admin-api-keys-show.js.es6
rename to app/assets/javascripts/admin/controllers/admin-api-keys-show.js
diff --git a/app/assets/javascripts/admin/controllers/admin-api-keys.js.es6 b/app/assets/javascripts/admin/controllers/admin-api-keys.js
similarity index 100%
rename from app/assets/javascripts/admin/controllers/admin-api-keys.js.es6
rename to app/assets/javascripts/admin/controllers/admin-api-keys.js
diff --git a/app/assets/javascripts/admin/controllers/admin-backups-index.js.es6 b/app/assets/javascripts/admin/controllers/admin-backups-index.js
similarity index 100%
rename from app/assets/javascripts/admin/controllers/admin-backups-index.js.es6
rename to app/assets/javascripts/admin/controllers/admin-backups-index.js
diff --git a/app/assets/javascripts/admin/controllers/admin-backups-logs.js.es6 b/app/assets/javascripts/admin/controllers/admin-backups-logs.js
similarity index 100%
rename from app/assets/javascripts/admin/controllers/admin-backups-logs.js.es6
rename to app/assets/javascripts/admin/controllers/admin-backups-logs.js
diff --git a/app/assets/javascripts/admin/controllers/admin-backups.js.es6 b/app/assets/javascripts/admin/controllers/admin-backups.js
similarity index 100%
rename from app/assets/javascripts/admin/controllers/admin-backups.js.es6
rename to app/assets/javascripts/admin/controllers/admin-backups.js
diff --git a/app/assets/javascripts/admin/controllers/admin-badges-award.js.es6 b/app/assets/javascripts/admin/controllers/admin-badges-award.js
similarity index 100%
rename from app/assets/javascripts/admin/controllers/admin-badges-award.js.es6
rename to app/assets/javascripts/admin/controllers/admin-badges-award.js
diff --git a/app/assets/javascripts/admin/controllers/admin-badges-show.js.es6 b/app/assets/javascripts/admin/controllers/admin-badges-show.js
similarity index 100%
rename from app/assets/javascripts/admin/controllers/admin-badges-show.js.es6
rename to app/assets/javascripts/admin/controllers/admin-badges-show.js
diff --git a/app/assets/javascripts/admin/controllers/admin-badges.js.es6 b/app/assets/javascripts/admin/controllers/admin-badges.js
similarity index 100%
rename from app/assets/javascripts/admin/controllers/admin-badges.js.es6
rename to app/assets/javascripts/admin/controllers/admin-badges.js
diff --git a/app/assets/javascripts/admin/controllers/admin-customize-colors-show.js.es6 b/app/assets/javascripts/admin/controllers/admin-customize-colors-show.js
similarity index 100%
rename from app/assets/javascripts/admin/controllers/admin-customize-colors-show.js.es6
rename to app/assets/javascripts/admin/controllers/admin-customize-colors-show.js
diff --git a/app/assets/javascripts/admin/controllers/admin-customize-colors.js.es6 b/app/assets/javascripts/admin/controllers/admin-customize-colors.js
similarity index 100%
rename from app/assets/javascripts/admin/controllers/admin-customize-colors.js.es6
rename to app/assets/javascripts/admin/controllers/admin-customize-colors.js
diff --git a/app/assets/javascripts/admin/controllers/admin-customize-email-style-edit.js.es6 b/app/assets/javascripts/admin/controllers/admin-customize-email-style-edit.js
similarity index 100%
rename from app/assets/javascripts/admin/controllers/admin-customize-email-style-edit.js.es6
rename to app/assets/javascripts/admin/controllers/admin-customize-email-style-edit.js
diff --git a/app/assets/javascripts/admin/controllers/admin-customize-email-templates-edit.js.es6 b/app/assets/javascripts/admin/controllers/admin-customize-email-templates-edit.js
similarity index 100%
rename from app/assets/javascripts/admin/controllers/admin-customize-email-templates-edit.js.es6
rename to app/assets/javascripts/admin/controllers/admin-customize-email-templates-edit.js
diff --git a/app/assets/javascripts/admin/controllers/admin-customize-email-templates.js.es6 b/app/assets/javascripts/admin/controllers/admin-customize-email-templates.js
similarity index 100%
rename from app/assets/javascripts/admin/controllers/admin-customize-email-templates.js.es6
rename to app/assets/javascripts/admin/controllers/admin-customize-email-templates.js
diff --git a/app/assets/javascripts/admin/controllers/admin-customize-robots-txt.js.es6 b/app/assets/javascripts/admin/controllers/admin-customize-robots-txt.js
similarity index 100%
rename from app/assets/javascripts/admin/controllers/admin-customize-robots-txt.js.es6
rename to app/assets/javascripts/admin/controllers/admin-customize-robots-txt.js
diff --git a/app/assets/javascripts/admin/controllers/admin-customize-themes-edit.js.es6 b/app/assets/javascripts/admin/controllers/admin-customize-themes-edit.js
similarity index 100%
rename from app/assets/javascripts/admin/controllers/admin-customize-themes-edit.js.es6
rename to app/assets/javascripts/admin/controllers/admin-customize-themes-edit.js
diff --git a/app/assets/javascripts/admin/controllers/admin-customize-themes-show.js.es6 b/app/assets/javascripts/admin/controllers/admin-customize-themes-show.js
similarity index 100%
rename from app/assets/javascripts/admin/controllers/admin-customize-themes-show.js.es6
rename to app/assets/javascripts/admin/controllers/admin-customize-themes-show.js
diff --git a/app/assets/javascripts/admin/controllers/admin-customize-themes.js.es6 b/app/assets/javascripts/admin/controllers/admin-customize-themes.js
similarity index 100%
rename from app/assets/javascripts/admin/controllers/admin-customize-themes.js.es6
rename to app/assets/javascripts/admin/controllers/admin-customize-themes.js
diff --git a/app/assets/javascripts/admin/controllers/admin-dashboard-general.js.es6 b/app/assets/javascripts/admin/controllers/admin-dashboard-general.js
similarity index 100%
rename from app/assets/javascripts/admin/controllers/admin-dashboard-general.js.es6
rename to app/assets/javascripts/admin/controllers/admin-dashboard-general.js
diff --git a/app/assets/javascripts/admin/controllers/admin-dashboard-moderation.js.es6 b/app/assets/javascripts/admin/controllers/admin-dashboard-moderation.js
similarity index 100%
rename from app/assets/javascripts/admin/controllers/admin-dashboard-moderation.js.es6
rename to app/assets/javascripts/admin/controllers/admin-dashboard-moderation.js
diff --git a/app/assets/javascripts/admin/controllers/admin-dashboard-reports.js.es6 b/app/assets/javascripts/admin/controllers/admin-dashboard-reports.js
similarity index 100%
rename from app/assets/javascripts/admin/controllers/admin-dashboard-reports.js.es6
rename to app/assets/javascripts/admin/controllers/admin-dashboard-reports.js
diff --git a/app/assets/javascripts/admin/controllers/admin-dashboard.js.es6 b/app/assets/javascripts/admin/controllers/admin-dashboard.js
similarity index 100%
rename from app/assets/javascripts/admin/controllers/admin-dashboard.js.es6
rename to app/assets/javascripts/admin/controllers/admin-dashboard.js
diff --git a/app/assets/javascripts/admin/controllers/admin-email-advanced-test.js.es6 b/app/assets/javascripts/admin/controllers/admin-email-advanced-test.js
similarity index 100%
rename from app/assets/javascripts/admin/controllers/admin-email-advanced-test.js.es6
rename to app/assets/javascripts/admin/controllers/admin-email-advanced-test.js
diff --git a/app/assets/javascripts/admin/controllers/admin-email-bounced.js.es6 b/app/assets/javascripts/admin/controllers/admin-email-bounced.js
similarity index 100%
rename from app/assets/javascripts/admin/controllers/admin-email-bounced.js.es6
rename to app/assets/javascripts/admin/controllers/admin-email-bounced.js
diff --git a/app/assets/javascripts/admin/controllers/admin-email-index.js.es6 b/app/assets/javascripts/admin/controllers/admin-email-index.js
similarity index 100%
rename from app/assets/javascripts/admin/controllers/admin-email-index.js.es6
rename to app/assets/javascripts/admin/controllers/admin-email-index.js
diff --git a/app/assets/javascripts/admin/controllers/admin-email-logs.js.es6 b/app/assets/javascripts/admin/controllers/admin-email-logs.js
similarity index 100%
rename from app/assets/javascripts/admin/controllers/admin-email-logs.js.es6
rename to app/assets/javascripts/admin/controllers/admin-email-logs.js
diff --git a/app/assets/javascripts/admin/controllers/admin-email-preview-digest.js.es6 b/app/assets/javascripts/admin/controllers/admin-email-preview-digest.js
similarity index 100%
rename from app/assets/javascripts/admin/controllers/admin-email-preview-digest.js.es6
rename to app/assets/javascripts/admin/controllers/admin-email-preview-digest.js
diff --git a/app/assets/javascripts/admin/controllers/admin-email-received.js.es6 b/app/assets/javascripts/admin/controllers/admin-email-received.js
similarity index 100%
rename from app/assets/javascripts/admin/controllers/admin-email-received.js.es6
rename to app/assets/javascripts/admin/controllers/admin-email-received.js
diff --git a/app/assets/javascripts/admin/controllers/admin-email-rejected.js.es6 b/app/assets/javascripts/admin/controllers/admin-email-rejected.js
similarity index 100%
rename from app/assets/javascripts/admin/controllers/admin-email-rejected.js.es6
rename to app/assets/javascripts/admin/controllers/admin-email-rejected.js
diff --git a/app/assets/javascripts/admin/controllers/admin-email-sent.js.es6 b/app/assets/javascripts/admin/controllers/admin-email-sent.js
similarity index 100%
rename from app/assets/javascripts/admin/controllers/admin-email-sent.js.es6
rename to app/assets/javascripts/admin/controllers/admin-email-sent.js
diff --git a/app/assets/javascripts/admin/controllers/admin-email-skipped.js.es6 b/app/assets/javascripts/admin/controllers/admin-email-skipped.js
similarity index 100%
rename from app/assets/javascripts/admin/controllers/admin-email-skipped.js.es6
rename to app/assets/javascripts/admin/controllers/admin-email-skipped.js
diff --git a/app/assets/javascripts/admin/controllers/admin-embedding.js.es6 b/app/assets/javascripts/admin/controllers/admin-embedding.js
similarity index 100%
rename from app/assets/javascripts/admin/controllers/admin-embedding.js.es6
rename to app/assets/javascripts/admin/controllers/admin-embedding.js
diff --git a/app/assets/javascripts/admin/controllers/admin-emojis.js.es6 b/app/assets/javascripts/admin/controllers/admin-emojis.js
similarity index 100%
rename from app/assets/javascripts/admin/controllers/admin-emojis.js.es6
rename to app/assets/javascripts/admin/controllers/admin-emojis.js
diff --git a/app/assets/javascripts/admin/controllers/admin-logs-screened-emails.js.es6 b/app/assets/javascripts/admin/controllers/admin-logs-screened-emails.js
similarity index 100%
rename from app/assets/javascripts/admin/controllers/admin-logs-screened-emails.js.es6
rename to app/assets/javascripts/admin/controllers/admin-logs-screened-emails.js
diff --git a/app/assets/javascripts/admin/controllers/admin-logs-screened-ip-addresses.js.es6 b/app/assets/javascripts/admin/controllers/admin-logs-screened-ip-addresses.js
similarity index 100%
rename from app/assets/javascripts/admin/controllers/admin-logs-screened-ip-addresses.js.es6
rename to app/assets/javascripts/admin/controllers/admin-logs-screened-ip-addresses.js
diff --git a/app/assets/javascripts/admin/controllers/admin-logs-screened-urls.js.es6 b/app/assets/javascripts/admin/controllers/admin-logs-screened-urls.js
similarity index 100%
rename from app/assets/javascripts/admin/controllers/admin-logs-screened-urls.js.es6
rename to app/assets/javascripts/admin/controllers/admin-logs-screened-urls.js
diff --git a/app/assets/javascripts/admin/controllers/admin-logs-staff-action-logs.js.es6 b/app/assets/javascripts/admin/controllers/admin-logs-staff-action-logs.js
similarity index 100%
rename from app/assets/javascripts/admin/controllers/admin-logs-staff-action-logs.js.es6
rename to app/assets/javascripts/admin/controllers/admin-logs-staff-action-logs.js
diff --git a/app/assets/javascripts/admin/controllers/admin-permalinks.js.es6 b/app/assets/javascripts/admin/controllers/admin-permalinks.js
similarity index 100%
rename from app/assets/javascripts/admin/controllers/admin-permalinks.js.es6
rename to app/assets/javascripts/admin/controllers/admin-permalinks.js
diff --git a/app/assets/javascripts/admin/controllers/admin-plugins.js.es6 b/app/assets/javascripts/admin/controllers/admin-plugins.js
similarity index 100%
rename from app/assets/javascripts/admin/controllers/admin-plugins.js.es6
rename to app/assets/javascripts/admin/controllers/admin-plugins.js
diff --git a/app/assets/javascripts/admin/controllers/admin-reports-show.js.es6 b/app/assets/javascripts/admin/controllers/admin-reports-show.js
similarity index 100%
rename from app/assets/javascripts/admin/controllers/admin-reports-show.js.es6
rename to app/assets/javascripts/admin/controllers/admin-reports-show.js
diff --git a/app/assets/javascripts/admin/controllers/admin-search-logs-index.js.es6 b/app/assets/javascripts/admin/controllers/admin-search-logs-index.js
similarity index 100%
rename from app/assets/javascripts/admin/controllers/admin-search-logs-index.js.es6
rename to app/assets/javascripts/admin/controllers/admin-search-logs-index.js
diff --git a/app/assets/javascripts/admin/controllers/admin-search-logs-term.js.es6 b/app/assets/javascripts/admin/controllers/admin-search-logs-term.js
similarity index 100%
rename from app/assets/javascripts/admin/controllers/admin-search-logs-term.js.es6
rename to app/assets/javascripts/admin/controllers/admin-search-logs-term.js
diff --git a/app/assets/javascripts/admin/controllers/admin-site-settings-category.js.es6 b/app/assets/javascripts/admin/controllers/admin-site-settings-category.js
similarity index 100%
rename from app/assets/javascripts/admin/controllers/admin-site-settings-category.js.es6
rename to app/assets/javascripts/admin/controllers/admin-site-settings-category.js
diff --git a/app/assets/javascripts/admin/controllers/admin-site-settings.js.es6 b/app/assets/javascripts/admin/controllers/admin-site-settings.js
similarity index 100%
rename from app/assets/javascripts/admin/controllers/admin-site-settings.js.es6
rename to app/assets/javascripts/admin/controllers/admin-site-settings.js
diff --git a/app/assets/javascripts/admin/controllers/admin-site-text-edit.js.es6 b/app/assets/javascripts/admin/controllers/admin-site-text-edit.js
similarity index 100%
rename from app/assets/javascripts/admin/controllers/admin-site-text-edit.js.es6
rename to app/assets/javascripts/admin/controllers/admin-site-text-edit.js
diff --git a/app/assets/javascripts/admin/controllers/admin-site-text-index.js.es6 b/app/assets/javascripts/admin/controllers/admin-site-text-index.js
similarity index 100%
rename from app/assets/javascripts/admin/controllers/admin-site-text-index.js.es6
rename to app/assets/javascripts/admin/controllers/admin-site-text-index.js
diff --git a/app/assets/javascripts/admin/controllers/admin-user-badges.js.es6 b/app/assets/javascripts/admin/controllers/admin-user-badges.js
similarity index 100%
rename from app/assets/javascripts/admin/controllers/admin-user-badges.js.es6
rename to app/assets/javascripts/admin/controllers/admin-user-badges.js
diff --git a/app/assets/javascripts/admin/controllers/admin-user-fields.js.es6 b/app/assets/javascripts/admin/controllers/admin-user-fields.js
similarity index 100%
rename from app/assets/javascripts/admin/controllers/admin-user-fields.js.es6
rename to app/assets/javascripts/admin/controllers/admin-user-fields.js
diff --git a/app/assets/javascripts/admin/controllers/admin-user-index.js.es6 b/app/assets/javascripts/admin/controllers/admin-user-index.js
similarity index 100%
rename from app/assets/javascripts/admin/controllers/admin-user-index.js.es6
rename to app/assets/javascripts/admin/controllers/admin-user-index.js
diff --git a/app/assets/javascripts/admin/controllers/admin-user.js.es6 b/app/assets/javascripts/admin/controllers/admin-user.js
similarity index 100%
rename from app/assets/javascripts/admin/controllers/admin-user.js.es6
rename to app/assets/javascripts/admin/controllers/admin-user.js
diff --git a/app/assets/javascripts/admin/controllers/admin-users-list-show.js.es6 b/app/assets/javascripts/admin/controllers/admin-users-list-show.js
similarity index 100%
rename from app/assets/javascripts/admin/controllers/admin-users-list-show.js.es6
rename to app/assets/javascripts/admin/controllers/admin-users-list-show.js
diff --git a/app/assets/javascripts/admin/controllers/admin-watched-words-action.js.es6 b/app/assets/javascripts/admin/controllers/admin-watched-words-action.js
similarity index 100%
rename from app/assets/javascripts/admin/controllers/admin-watched-words-action.js.es6
rename to app/assets/javascripts/admin/controllers/admin-watched-words-action.js
diff --git a/app/assets/javascripts/admin/controllers/admin-watched-words.js.es6 b/app/assets/javascripts/admin/controllers/admin-watched-words.js
similarity index 100%
rename from app/assets/javascripts/admin/controllers/admin-watched-words.js.es6
rename to app/assets/javascripts/admin/controllers/admin-watched-words.js
diff --git a/app/assets/javascripts/admin/controllers/admin-web-hooks-show-events.js.es6 b/app/assets/javascripts/admin/controllers/admin-web-hooks-show-events.js
similarity index 100%
rename from app/assets/javascripts/admin/controllers/admin-web-hooks-show-events.js.es6
rename to app/assets/javascripts/admin/controllers/admin-web-hooks-show-events.js
diff --git a/app/assets/javascripts/admin/controllers/admin-web-hooks-show.js.es6 b/app/assets/javascripts/admin/controllers/admin-web-hooks-show.js
similarity index 100%
rename from app/assets/javascripts/admin/controllers/admin-web-hooks-show.js.es6
rename to app/assets/javascripts/admin/controllers/admin-web-hooks-show.js
diff --git a/app/assets/javascripts/admin/controllers/admin-web-hooks.js.es6 b/app/assets/javascripts/admin/controllers/admin-web-hooks.js
similarity index 100%
rename from app/assets/javascripts/admin/controllers/admin-web-hooks.js.es6
rename to app/assets/javascripts/admin/controllers/admin-web-hooks.js
diff --git a/app/assets/javascripts/admin/controllers/admin.js.es6 b/app/assets/javascripts/admin/controllers/admin.js
similarity index 100%
rename from app/assets/javascripts/admin/controllers/admin.js.es6
rename to app/assets/javascripts/admin/controllers/admin.js
diff --git a/app/assets/javascripts/admin/controllers/modals/admin-add-upload.js.es6 b/app/assets/javascripts/admin/controllers/modals/admin-add-upload.js
similarity index 100%
rename from app/assets/javascripts/admin/controllers/modals/admin-add-upload.js.es6
rename to app/assets/javascripts/admin/controllers/modals/admin-add-upload.js
diff --git a/app/assets/javascripts/admin/controllers/modals/admin-badge-preview.js.es6 b/app/assets/javascripts/admin/controllers/modals/admin-badge-preview.js
similarity index 100%
rename from app/assets/javascripts/admin/controllers/modals/admin-badge-preview.js.es6
rename to app/assets/javascripts/admin/controllers/modals/admin-badge-preview.js
diff --git a/app/assets/javascripts/admin/controllers/modals/admin-color-scheme-select-base.js.es6 b/app/assets/javascripts/admin/controllers/modals/admin-color-scheme-select-base.js
similarity index 100%
rename from app/assets/javascripts/admin/controllers/modals/admin-color-scheme-select-base.js.es6
rename to app/assets/javascripts/admin/controllers/modals/admin-color-scheme-select-base.js
diff --git a/app/assets/javascripts/admin/controllers/modals/admin-edit-badge-groupings.js.es6 b/app/assets/javascripts/admin/controllers/modals/admin-edit-badge-groupings.js
similarity index 100%
rename from app/assets/javascripts/admin/controllers/modals/admin-edit-badge-groupings.js.es6
rename to app/assets/javascripts/admin/controllers/modals/admin-edit-badge-groupings.js
diff --git a/app/assets/javascripts/admin/controllers/modals/admin-incoming-email.js.es6 b/app/assets/javascripts/admin/controllers/modals/admin-incoming-email.js
similarity index 100%
rename from app/assets/javascripts/admin/controllers/modals/admin-incoming-email.js.es6
rename to app/assets/javascripts/admin/controllers/modals/admin-incoming-email.js
diff --git a/app/assets/javascripts/admin/controllers/modals/admin-install-theme.js.es6 b/app/assets/javascripts/admin/controllers/modals/admin-install-theme.js
similarity index 100%
rename from app/assets/javascripts/admin/controllers/modals/admin-install-theme.js.es6
rename to app/assets/javascripts/admin/controllers/modals/admin-install-theme.js
diff --git a/app/assets/javascripts/admin/controllers/modals/admin-reseed.js.es6 b/app/assets/javascripts/admin/controllers/modals/admin-reseed.js
similarity index 100%
rename from app/assets/javascripts/admin/controllers/modals/admin-reseed.js.es6
rename to app/assets/javascripts/admin/controllers/modals/admin-reseed.js
diff --git a/app/assets/javascripts/admin/controllers/modals/admin-silence-user.js.es6 b/app/assets/javascripts/admin/controllers/modals/admin-silence-user.js
similarity index 100%
rename from app/assets/javascripts/admin/controllers/modals/admin-silence-user.js.es6
rename to app/assets/javascripts/admin/controllers/modals/admin-silence-user.js
diff --git a/app/assets/javascripts/admin/controllers/modals/admin-staff-action-log-details.js.es6 b/app/assets/javascripts/admin/controllers/modals/admin-staff-action-log-details.js
similarity index 100%
rename from app/assets/javascripts/admin/controllers/modals/admin-staff-action-log-details.js.es6
rename to app/assets/javascripts/admin/controllers/modals/admin-staff-action-log-details.js
diff --git a/app/assets/javascripts/admin/controllers/modals/admin-start-backup.js.es6 b/app/assets/javascripts/admin/controllers/modals/admin-start-backup.js
similarity index 100%
rename from app/assets/javascripts/admin/controllers/modals/admin-start-backup.js.es6
rename to app/assets/javascripts/admin/controllers/modals/admin-start-backup.js
diff --git a/app/assets/javascripts/admin/controllers/modals/admin-suspend-user.js.es6 b/app/assets/javascripts/admin/controllers/modals/admin-suspend-user.js
similarity index 100%
rename from app/assets/javascripts/admin/controllers/modals/admin-suspend-user.js.es6
rename to app/assets/javascripts/admin/controllers/modals/admin-suspend-user.js
diff --git a/app/assets/javascripts/admin/controllers/modals/admin-theme-change.js.es6 b/app/assets/javascripts/admin/controllers/modals/admin-theme-change.js
similarity index 100%
rename from app/assets/javascripts/admin/controllers/modals/admin-theme-change.js.es6
rename to app/assets/javascripts/admin/controllers/modals/admin-theme-change.js
diff --git a/app/assets/javascripts/admin/controllers/modals/admin-uploaded-image-list.js.es6 b/app/assets/javascripts/admin/controllers/modals/admin-uploaded-image-list.js
similarity index 100%
rename from app/assets/javascripts/admin/controllers/modals/admin-uploaded-image-list.js.es6
rename to app/assets/javascripts/admin/controllers/modals/admin-uploaded-image-list.js
diff --git a/app/assets/javascripts/admin/controllers/modals/admin-watched-word-test.js.es6 b/app/assets/javascripts/admin/controllers/modals/admin-watched-word-test.js
similarity index 100%
rename from app/assets/javascripts/admin/controllers/modals/admin-watched-word-test.js.es6
rename to app/assets/javascripts/admin/controllers/modals/admin-watched-word-test.js
diff --git a/app/assets/javascripts/admin/controllers/modals/site-setting-default-categories.js.es6 b/app/assets/javascripts/admin/controllers/modals/site-setting-default-categories.js
similarity index 100%
rename from app/assets/javascripts/admin/controllers/modals/site-setting-default-categories.js.es6
rename to app/assets/javascripts/admin/controllers/modals/site-setting-default-categories.js
diff --git a/app/assets/javascripts/admin/helpers/check-icon.js.es6 b/app/assets/javascripts/admin/helpers/check-icon.js
similarity index 100%
rename from app/assets/javascripts/admin/helpers/check-icon.js.es6
rename to app/assets/javascripts/admin/helpers/check-icon.js
diff --git a/app/assets/javascripts/admin/helpers/disposition-icon.js.es6 b/app/assets/javascripts/admin/helpers/disposition-icon.js
similarity index 100%
rename from app/assets/javascripts/admin/helpers/disposition-icon.js.es6
rename to app/assets/javascripts/admin/helpers/disposition-icon.js
diff --git a/app/assets/javascripts/admin/helpers/human-size.js.es6 b/app/assets/javascripts/admin/helpers/human-size.js
similarity index 100%
rename from app/assets/javascripts/admin/helpers/human-size.js.es6
rename to app/assets/javascripts/admin/helpers/human-size.js
diff --git a/app/assets/javascripts/admin/helpers/post-action-title.js.es6 b/app/assets/javascripts/admin/helpers/post-action-title.js
similarity index 100%
rename from app/assets/javascripts/admin/helpers/post-action-title.js.es6
rename to app/assets/javascripts/admin/helpers/post-action-title.js
diff --git a/app/assets/javascripts/admin/helpers/preserve-newlines.js.es6 b/app/assets/javascripts/admin/helpers/preserve-newlines.js
similarity index 100%
rename from app/assets/javascripts/admin/helpers/preserve-newlines.js.es6
rename to app/assets/javascripts/admin/helpers/preserve-newlines.js
diff --git a/app/assets/javascripts/admin/helpers/value-at-tl.js.es6 b/app/assets/javascripts/admin/helpers/value-at-tl.js
similarity index 100%
rename from app/assets/javascripts/admin/helpers/value-at-tl.js.es6
rename to app/assets/javascripts/admin/helpers/value-at-tl.js
diff --git a/app/assets/javascripts/admin/mixins/penalty-controller.js.es6 b/app/assets/javascripts/admin/mixins/penalty-controller.js
similarity index 100%
rename from app/assets/javascripts/admin/mixins/penalty-controller.js.es6
rename to app/assets/javascripts/admin/mixins/penalty-controller.js
diff --git a/app/assets/javascripts/admin/mixins/period-computation.js.es6 b/app/assets/javascripts/admin/mixins/period-computation.js
similarity index 100%
rename from app/assets/javascripts/admin/mixins/period-computation.js.es6
rename to app/assets/javascripts/admin/mixins/period-computation.js
diff --git a/app/assets/javascripts/admin/mixins/setting-component.js.es6 b/app/assets/javascripts/admin/mixins/setting-component.js
similarity index 100%
rename from app/assets/javascripts/admin/mixins/setting-component.js.es6
rename to app/assets/javascripts/admin/mixins/setting-component.js
diff --git a/app/assets/javascripts/admin/mixins/setting-object.js.es6 b/app/assets/javascripts/admin/mixins/setting-object.js
similarity index 100%
rename from app/assets/javascripts/admin/mixins/setting-object.js.es6
rename to app/assets/javascripts/admin/mixins/setting-object.js
diff --git a/app/assets/javascripts/admin/models/admin-dashboard.js.es6 b/app/assets/javascripts/admin/models/admin-dashboard.js
similarity index 100%
rename from app/assets/javascripts/admin/models/admin-dashboard.js.es6
rename to app/assets/javascripts/admin/models/admin-dashboard.js
diff --git a/app/assets/javascripts/admin/models/admin-user.js.es6 b/app/assets/javascripts/admin/models/admin-user.js
similarity index 100%
rename from app/assets/javascripts/admin/models/admin-user.js.es6
rename to app/assets/javascripts/admin/models/admin-user.js
diff --git a/app/assets/javascripts/admin/models/api-key.js.es6 b/app/assets/javascripts/admin/models/api-key.js
similarity index 100%
rename from app/assets/javascripts/admin/models/api-key.js.es6
rename to app/assets/javascripts/admin/models/api-key.js
diff --git a/app/assets/javascripts/admin/models/backup-status.js.es6 b/app/assets/javascripts/admin/models/backup-status.js
similarity index 100%
rename from app/assets/javascripts/admin/models/backup-status.js.es6
rename to app/assets/javascripts/admin/models/backup-status.js
diff --git a/app/assets/javascripts/admin/models/backup.js.es6 b/app/assets/javascripts/admin/models/backup.js
similarity index 100%
rename from app/assets/javascripts/admin/models/backup.js.es6
rename to app/assets/javascripts/admin/models/backup.js
diff --git a/app/assets/javascripts/admin/models/color-scheme-color.js.es6 b/app/assets/javascripts/admin/models/color-scheme-color.js
similarity index 100%
rename from app/assets/javascripts/admin/models/color-scheme-color.js.es6
rename to app/assets/javascripts/admin/models/color-scheme-color.js
diff --git a/app/assets/javascripts/admin/models/color-scheme.js.es6 b/app/assets/javascripts/admin/models/color-scheme.js
similarity index 100%
rename from app/assets/javascripts/admin/models/color-scheme.js.es6
rename to app/assets/javascripts/admin/models/color-scheme.js
diff --git a/app/assets/javascripts/admin/models/email-log.js.es6 b/app/assets/javascripts/admin/models/email-log.js
similarity index 100%
rename from app/assets/javascripts/admin/models/email-log.js.es6
rename to app/assets/javascripts/admin/models/email-log.js
diff --git a/app/assets/javascripts/admin/models/email-preview.js.es6 b/app/assets/javascripts/admin/models/email-preview.js
similarity index 100%
rename from app/assets/javascripts/admin/models/email-preview.js.es6
rename to app/assets/javascripts/admin/models/email-preview.js
diff --git a/app/assets/javascripts/admin/models/email-settings.js.es6 b/app/assets/javascripts/admin/models/email-settings.js
similarity index 100%
rename from app/assets/javascripts/admin/models/email-settings.js.es6
rename to app/assets/javascripts/admin/models/email-settings.js
diff --git a/app/assets/javascripts/admin/models/email-style.js.es6 b/app/assets/javascripts/admin/models/email-style.js
similarity index 100%
rename from app/assets/javascripts/admin/models/email-style.js.es6
rename to app/assets/javascripts/admin/models/email-style.js
diff --git a/app/assets/javascripts/admin/models/email-template.js.es6 b/app/assets/javascripts/admin/models/email-template.js
similarity index 100%
rename from app/assets/javascripts/admin/models/email-template.js.es6
rename to app/assets/javascripts/admin/models/email-template.js
diff --git a/app/assets/javascripts/admin/models/flag-type.js.es6 b/app/assets/javascripts/admin/models/flag-type.js
similarity index 100%
rename from app/assets/javascripts/admin/models/flag-type.js.es6
rename to app/assets/javascripts/admin/models/flag-type.js
diff --git a/app/assets/javascripts/admin/models/incoming-email.js.es6 b/app/assets/javascripts/admin/models/incoming-email.js
similarity index 100%
rename from app/assets/javascripts/admin/models/incoming-email.js.es6
rename to app/assets/javascripts/admin/models/incoming-email.js
diff --git a/app/assets/javascripts/admin/models/permalink.js.es6 b/app/assets/javascripts/admin/models/permalink.js
similarity index 100%
rename from app/assets/javascripts/admin/models/permalink.js.es6
rename to app/assets/javascripts/admin/models/permalink.js
diff --git a/app/assets/javascripts/admin/models/report.js.es6 b/app/assets/javascripts/admin/models/report.js
similarity index 100%
rename from app/assets/javascripts/admin/models/report.js.es6
rename to app/assets/javascripts/admin/models/report.js
diff --git a/app/assets/javascripts/admin/models/screened-email.js.es6 b/app/assets/javascripts/admin/models/screened-email.js
similarity index 100%
rename from app/assets/javascripts/admin/models/screened-email.js.es6
rename to app/assets/javascripts/admin/models/screened-email.js
diff --git a/app/assets/javascripts/admin/models/screened-ip-address.js.es6 b/app/assets/javascripts/admin/models/screened-ip-address.js
similarity index 100%
rename from app/assets/javascripts/admin/models/screened-ip-address.js.es6
rename to app/assets/javascripts/admin/models/screened-ip-address.js
diff --git a/app/assets/javascripts/admin/models/screened-url.js.es6 b/app/assets/javascripts/admin/models/screened-url.js
similarity index 100%
rename from app/assets/javascripts/admin/models/screened-url.js.es6
rename to app/assets/javascripts/admin/models/screened-url.js
diff --git a/app/assets/javascripts/admin/models/site-setting.js.es6 b/app/assets/javascripts/admin/models/site-setting.js
similarity index 100%
rename from app/assets/javascripts/admin/models/site-setting.js.es6
rename to app/assets/javascripts/admin/models/site-setting.js
diff --git a/app/assets/javascripts/admin/models/site-text.js.es6 b/app/assets/javascripts/admin/models/site-text.js
similarity index 100%
rename from app/assets/javascripts/admin/models/site-text.js.es6
rename to app/assets/javascripts/admin/models/site-text.js
diff --git a/app/assets/javascripts/admin/models/staff-action-log.js.es6 b/app/assets/javascripts/admin/models/staff-action-log.js
similarity index 100%
rename from app/assets/javascripts/admin/models/staff-action-log.js.es6
rename to app/assets/javascripts/admin/models/staff-action-log.js
diff --git a/app/assets/javascripts/admin/models/theme-settings.js.es6 b/app/assets/javascripts/admin/models/theme-settings.js
similarity index 100%
rename from app/assets/javascripts/admin/models/theme-settings.js.es6
rename to app/assets/javascripts/admin/models/theme-settings.js
diff --git a/app/assets/javascripts/admin/models/theme.js.es6 b/app/assets/javascripts/admin/models/theme.js
similarity index 100%
rename from app/assets/javascripts/admin/models/theme.js.es6
rename to app/assets/javascripts/admin/models/theme.js
diff --git a/app/assets/javascripts/admin/models/tl3-requirements.js.es6 b/app/assets/javascripts/admin/models/tl3-requirements.js
similarity index 100%
rename from app/assets/javascripts/admin/models/tl3-requirements.js.es6
rename to app/assets/javascripts/admin/models/tl3-requirements.js
diff --git a/app/assets/javascripts/admin/models/user-field.js.es6 b/app/assets/javascripts/admin/models/user-field.js
similarity index 100%
rename from app/assets/javascripts/admin/models/user-field.js.es6
rename to app/assets/javascripts/admin/models/user-field.js
diff --git a/app/assets/javascripts/admin/models/version-check.js.es6 b/app/assets/javascripts/admin/models/version-check.js
similarity index 100%
rename from app/assets/javascripts/admin/models/version-check.js.es6
rename to app/assets/javascripts/admin/models/version-check.js
diff --git a/app/assets/javascripts/admin/models/watched-word.js.es6 b/app/assets/javascripts/admin/models/watched-word.js
similarity index 100%
rename from app/assets/javascripts/admin/models/watched-word.js.es6
rename to app/assets/javascripts/admin/models/watched-word.js
diff --git a/app/assets/javascripts/admin/models/web-hook.js.es6 b/app/assets/javascripts/admin/models/web-hook.js
similarity index 100%
rename from app/assets/javascripts/admin/models/web-hook.js.es6
rename to app/assets/javascripts/admin/models/web-hook.js
diff --git a/app/assets/javascripts/admin/routes/admin-api-index.js.es6 b/app/assets/javascripts/admin/routes/admin-api-index.js
similarity index 100%
rename from app/assets/javascripts/admin/routes/admin-api-index.js.es6
rename to app/assets/javascripts/admin/routes/admin-api-index.js
diff --git a/app/assets/javascripts/admin/routes/admin-api-keys-index.js.es6 b/app/assets/javascripts/admin/routes/admin-api-keys-index.js
similarity index 100%
rename from app/assets/javascripts/admin/routes/admin-api-keys-index.js.es6
rename to app/assets/javascripts/admin/routes/admin-api-keys-index.js
diff --git a/app/assets/javascripts/admin/routes/admin-api-keys-show.js.es6 b/app/assets/javascripts/admin/routes/admin-api-keys-show.js
similarity index 100%
rename from app/assets/javascripts/admin/routes/admin-api-keys-show.js.es6
rename to app/assets/javascripts/admin/routes/admin-api-keys-show.js
diff --git a/app/assets/javascripts/admin/routes/admin-api-keys.js.es6 b/app/assets/javascripts/admin/routes/admin-api-keys.js
similarity index 100%
rename from app/assets/javascripts/admin/routes/admin-api-keys.js.es6
rename to app/assets/javascripts/admin/routes/admin-api-keys.js
diff --git a/app/assets/javascripts/admin/routes/admin-backups-index.js.es6 b/app/assets/javascripts/admin/routes/admin-backups-index.js
similarity index 100%
rename from app/assets/javascripts/admin/routes/admin-backups-index.js.es6
rename to app/assets/javascripts/admin/routes/admin-backups-index.js
diff --git a/app/assets/javascripts/admin/routes/admin-backups-logs.js.es6 b/app/assets/javascripts/admin/routes/admin-backups-logs.js
similarity index 100%
rename from app/assets/javascripts/admin/routes/admin-backups-logs.js.es6
rename to app/assets/javascripts/admin/routes/admin-backups-logs.js
diff --git a/app/assets/javascripts/admin/routes/admin-backups.js.es6 b/app/assets/javascripts/admin/routes/admin-backups.js
similarity index 100%
rename from app/assets/javascripts/admin/routes/admin-backups.js.es6
rename to app/assets/javascripts/admin/routes/admin-backups.js
diff --git a/app/assets/javascripts/admin/routes/admin-badges-award.js.es6 b/app/assets/javascripts/admin/routes/admin-badges-award.js
similarity index 100%
rename from app/assets/javascripts/admin/routes/admin-badges-award.js.es6
rename to app/assets/javascripts/admin/routes/admin-badges-award.js
diff --git a/app/assets/javascripts/admin/routes/admin-badges-index.js.es6 b/app/assets/javascripts/admin/routes/admin-badges-index.js
similarity index 100%
rename from app/assets/javascripts/admin/routes/admin-badges-index.js.es6
rename to app/assets/javascripts/admin/routes/admin-badges-index.js
diff --git a/app/assets/javascripts/admin/routes/admin-badges-show.js.es6 b/app/assets/javascripts/admin/routes/admin-badges-show.js
similarity index 100%
rename from app/assets/javascripts/admin/routes/admin-badges-show.js.es6
rename to app/assets/javascripts/admin/routes/admin-badges-show.js
diff --git a/app/assets/javascripts/admin/routes/admin-badges.js.es6 b/app/assets/javascripts/admin/routes/admin-badges.js
similarity index 100%
rename from app/assets/javascripts/admin/routes/admin-badges.js.es6
rename to app/assets/javascripts/admin/routes/admin-badges.js
diff --git a/app/assets/javascripts/admin/routes/admin-customize-colors-show.js.es6 b/app/assets/javascripts/admin/routes/admin-customize-colors-show.js
similarity index 100%
rename from app/assets/javascripts/admin/routes/admin-customize-colors-show.js.es6
rename to app/assets/javascripts/admin/routes/admin-customize-colors-show.js
diff --git a/app/assets/javascripts/admin/routes/admin-customize-colors.js.es6 b/app/assets/javascripts/admin/routes/admin-customize-colors.js
similarity index 100%
rename from app/assets/javascripts/admin/routes/admin-customize-colors.js.es6
rename to app/assets/javascripts/admin/routes/admin-customize-colors.js
diff --git a/app/assets/javascripts/admin/routes/admin-customize-email-style-edit.js.es6 b/app/assets/javascripts/admin/routes/admin-customize-email-style-edit.js
similarity index 100%
rename from app/assets/javascripts/admin/routes/admin-customize-email-style-edit.js.es6
rename to app/assets/javascripts/admin/routes/admin-customize-email-style-edit.js
diff --git a/app/assets/javascripts/admin/routes/admin-customize-email-style-index.js.es6 b/app/assets/javascripts/admin/routes/admin-customize-email-style-index.js
similarity index 100%
rename from app/assets/javascripts/admin/routes/admin-customize-email-style-index.js.es6
rename to app/assets/javascripts/admin/routes/admin-customize-email-style-index.js
diff --git a/app/assets/javascripts/admin/routes/admin-customize-email-style.js.es6 b/app/assets/javascripts/admin/routes/admin-customize-email-style.js
similarity index 100%
rename from app/assets/javascripts/admin/routes/admin-customize-email-style.js.es6
rename to app/assets/javascripts/admin/routes/admin-customize-email-style.js
diff --git a/app/assets/javascripts/admin/routes/admin-customize-email-templates-edit.js.es6 b/app/assets/javascripts/admin/routes/admin-customize-email-templates-edit.js
similarity index 100%
rename from app/assets/javascripts/admin/routes/admin-customize-email-templates-edit.js.es6
rename to app/assets/javascripts/admin/routes/admin-customize-email-templates-edit.js
diff --git a/app/assets/javascripts/admin/routes/admin-customize-email-templates.js.es6 b/app/assets/javascripts/admin/routes/admin-customize-email-templates.js
similarity index 100%
rename from app/assets/javascripts/admin/routes/admin-customize-email-templates.js.es6
rename to app/assets/javascripts/admin/routes/admin-customize-email-templates.js
diff --git a/app/assets/javascripts/admin/routes/admin-customize-index.js.es6 b/app/assets/javascripts/admin/routes/admin-customize-index.js
similarity index 100%
rename from app/assets/javascripts/admin/routes/admin-customize-index.js.es6
rename to app/assets/javascripts/admin/routes/admin-customize-index.js
diff --git a/app/assets/javascripts/admin/routes/admin-customize-robots-txt.js.es6 b/app/assets/javascripts/admin/routes/admin-customize-robots-txt.js
similarity index 100%
rename from app/assets/javascripts/admin/routes/admin-customize-robots-txt.js.es6
rename to app/assets/javascripts/admin/routes/admin-customize-robots-txt.js
diff --git a/app/assets/javascripts/admin/routes/admin-customize-themes-edit.js.es6 b/app/assets/javascripts/admin/routes/admin-customize-themes-edit.js
similarity index 100%
rename from app/assets/javascripts/admin/routes/admin-customize-themes-edit.js.es6
rename to app/assets/javascripts/admin/routes/admin-customize-themes-edit.js
diff --git a/app/assets/javascripts/admin/routes/admin-customize-themes-index.js.es6 b/app/assets/javascripts/admin/routes/admin-customize-themes-index.js
similarity index 100%
rename from app/assets/javascripts/admin/routes/admin-customize-themes-index.js.es6
rename to app/assets/javascripts/admin/routes/admin-customize-themes-index.js
diff --git a/app/assets/javascripts/admin/routes/admin-customize-themes-show.js.es6 b/app/assets/javascripts/admin/routes/admin-customize-themes-show.js
similarity index 100%
rename from app/assets/javascripts/admin/routes/admin-customize-themes-show.js.es6
rename to app/assets/javascripts/admin/routes/admin-customize-themes-show.js
diff --git a/app/assets/javascripts/admin/routes/admin-customize-themes.js.es6 b/app/assets/javascripts/admin/routes/admin-customize-themes.js
similarity index 100%
rename from app/assets/javascripts/admin/routes/admin-customize-themes.js.es6
rename to app/assets/javascripts/admin/routes/admin-customize-themes.js
diff --git a/app/assets/javascripts/admin/routes/admin-dashboard-general.js.es6 b/app/assets/javascripts/admin/routes/admin-dashboard-general.js
similarity index 100%
rename from app/assets/javascripts/admin/routes/admin-dashboard-general.js.es6
rename to app/assets/javascripts/admin/routes/admin-dashboard-general.js
diff --git a/app/assets/javascripts/admin/routes/admin-dashboard-reports.js.es6 b/app/assets/javascripts/admin/routes/admin-dashboard-reports.js
similarity index 100%
rename from app/assets/javascripts/admin/routes/admin-dashboard-reports.js.es6
rename to app/assets/javascripts/admin/routes/admin-dashboard-reports.js
diff --git a/app/assets/javascripts/admin/routes/admin-dashboard.js.es6 b/app/assets/javascripts/admin/routes/admin-dashboard.js
similarity index 100%
rename from app/assets/javascripts/admin/routes/admin-dashboard.js.es6
rename to app/assets/javascripts/admin/routes/admin-dashboard.js
diff --git a/app/assets/javascripts/admin/routes/admin-email-bounced.js.es6 b/app/assets/javascripts/admin/routes/admin-email-bounced.js
similarity index 100%
rename from app/assets/javascripts/admin/routes/admin-email-bounced.js.es6
rename to app/assets/javascripts/admin/routes/admin-email-bounced.js
diff --git a/app/assets/javascripts/admin/routes/admin-email-incomings.js.es6 b/app/assets/javascripts/admin/routes/admin-email-incomings.js
similarity index 100%
rename from app/assets/javascripts/admin/routes/admin-email-incomings.js.es6
rename to app/assets/javascripts/admin/routes/admin-email-incomings.js
diff --git a/app/assets/javascripts/admin/routes/admin-email-index.js.es6 b/app/assets/javascripts/admin/routes/admin-email-index.js
similarity index 100%
rename from app/assets/javascripts/admin/routes/admin-email-index.js.es6
rename to app/assets/javascripts/admin/routes/admin-email-index.js
diff --git a/app/assets/javascripts/admin/routes/admin-email-logs.js.es6 b/app/assets/javascripts/admin/routes/admin-email-logs.js
similarity index 100%
rename from app/assets/javascripts/admin/routes/admin-email-logs.js.es6
rename to app/assets/javascripts/admin/routes/admin-email-logs.js
diff --git a/app/assets/javascripts/admin/routes/admin-email-preview-digest.js.es6 b/app/assets/javascripts/admin/routes/admin-email-preview-digest.js
similarity index 100%
rename from app/assets/javascripts/admin/routes/admin-email-preview-digest.js.es6
rename to app/assets/javascripts/admin/routes/admin-email-preview-digest.js
diff --git a/app/assets/javascripts/admin/routes/admin-email-received.js.es6 b/app/assets/javascripts/admin/routes/admin-email-received.js
similarity index 100%
rename from app/assets/javascripts/admin/routes/admin-email-received.js.es6
rename to app/assets/javascripts/admin/routes/admin-email-received.js
diff --git a/app/assets/javascripts/admin/routes/admin-email-rejected.js.es6 b/app/assets/javascripts/admin/routes/admin-email-rejected.js
similarity index 100%
rename from app/assets/javascripts/admin/routes/admin-email-rejected.js.es6
rename to app/assets/javascripts/admin/routes/admin-email-rejected.js
diff --git a/app/assets/javascripts/admin/routes/admin-email-sent.js.es6 b/app/assets/javascripts/admin/routes/admin-email-sent.js
similarity index 100%
rename from app/assets/javascripts/admin/routes/admin-email-sent.js.es6
rename to app/assets/javascripts/admin/routes/admin-email-sent.js
diff --git a/app/assets/javascripts/admin/routes/admin-email-skipped.js.es6 b/app/assets/javascripts/admin/routes/admin-email-skipped.js
similarity index 100%
rename from app/assets/javascripts/admin/routes/admin-email-skipped.js.es6
rename to app/assets/javascripts/admin/routes/admin-email-skipped.js
diff --git a/app/assets/javascripts/admin/routes/admin-embedding.js.es6 b/app/assets/javascripts/admin/routes/admin-embedding.js
similarity index 100%
rename from app/assets/javascripts/admin/routes/admin-embedding.js.es6
rename to app/assets/javascripts/admin/routes/admin-embedding.js
diff --git a/app/assets/javascripts/admin/routes/admin-emojis.js.es6 b/app/assets/javascripts/admin/routes/admin-emojis.js
similarity index 100%
rename from app/assets/javascripts/admin/routes/admin-emojis.js.es6
rename to app/assets/javascripts/admin/routes/admin-emojis.js
diff --git a/app/assets/javascripts/admin/routes/admin-flags-posts-active.js.es6 b/app/assets/javascripts/admin/routes/admin-flags-posts-active.js
similarity index 100%
rename from app/assets/javascripts/admin/routes/admin-flags-posts-active.js.es6
rename to app/assets/javascripts/admin/routes/admin-flags-posts-active.js
diff --git a/app/assets/javascripts/admin/routes/admin-flags-posts-old.js.es6 b/app/assets/javascripts/admin/routes/admin-flags-posts-old.js
similarity index 100%
rename from app/assets/javascripts/admin/routes/admin-flags-posts-old.js.es6
rename to app/assets/javascripts/admin/routes/admin-flags-posts-old.js
diff --git a/app/assets/javascripts/admin/routes/admin-flags-topics-index.js.es6 b/app/assets/javascripts/admin/routes/admin-flags-topics-index.js
similarity index 100%
rename from app/assets/javascripts/admin/routes/admin-flags-topics-index.js.es6
rename to app/assets/javascripts/admin/routes/admin-flags-topics-index.js
diff --git a/app/assets/javascripts/admin/routes/admin-logs-index.js.es6 b/app/assets/javascripts/admin/routes/admin-logs-index.js
similarity index 100%
rename from app/assets/javascripts/admin/routes/admin-logs-index.js.es6
rename to app/assets/javascripts/admin/routes/admin-logs-index.js
diff --git a/app/assets/javascripts/admin/routes/admin-logs-screened-emails.js.es6 b/app/assets/javascripts/admin/routes/admin-logs-screened-emails.js
similarity index 100%
rename from app/assets/javascripts/admin/routes/admin-logs-screened-emails.js.es6
rename to app/assets/javascripts/admin/routes/admin-logs-screened-emails.js
diff --git a/app/assets/javascripts/admin/routes/admin-logs-screened-ip-addresses.js.es6 b/app/assets/javascripts/admin/routes/admin-logs-screened-ip-addresses.js
similarity index 100%
rename from app/assets/javascripts/admin/routes/admin-logs-screened-ip-addresses.js.es6
rename to app/assets/javascripts/admin/routes/admin-logs-screened-ip-addresses.js
diff --git a/app/assets/javascripts/admin/routes/admin-logs-screened-urls.js.es6 b/app/assets/javascripts/admin/routes/admin-logs-screened-urls.js
similarity index 100%
rename from app/assets/javascripts/admin/routes/admin-logs-screened-urls.js.es6
rename to app/assets/javascripts/admin/routes/admin-logs-screened-urls.js
diff --git a/app/assets/javascripts/admin/routes/admin-logs-staff-action-logs.js.es6 b/app/assets/javascripts/admin/routes/admin-logs-staff-action-logs.js
similarity index 100%
rename from app/assets/javascripts/admin/routes/admin-logs-staff-action-logs.js.es6
rename to app/assets/javascripts/admin/routes/admin-logs-staff-action-logs.js
diff --git a/app/assets/javascripts/admin/routes/admin-permalinks.js.es6 b/app/assets/javascripts/admin/routes/admin-permalinks.js
similarity index 100%
rename from app/assets/javascripts/admin/routes/admin-permalinks.js.es6
rename to app/assets/javascripts/admin/routes/admin-permalinks.js
diff --git a/app/assets/javascripts/admin/routes/admin-plugins.js.es6 b/app/assets/javascripts/admin/routes/admin-plugins.js
similarity index 100%
rename from app/assets/javascripts/admin/routes/admin-plugins.js.es6
rename to app/assets/javascripts/admin/routes/admin-plugins.js
diff --git a/app/assets/javascripts/admin/routes/admin-reports-index.js.es6 b/app/assets/javascripts/admin/routes/admin-reports-index.js
similarity index 100%
rename from app/assets/javascripts/admin/routes/admin-reports-index.js.es6
rename to app/assets/javascripts/admin/routes/admin-reports-index.js
diff --git a/app/assets/javascripts/admin/routes/admin-reports-show.js.es6 b/app/assets/javascripts/admin/routes/admin-reports-show.js
similarity index 100%
rename from app/assets/javascripts/admin/routes/admin-reports-show.js.es6
rename to app/assets/javascripts/admin/routes/admin-reports-show.js
diff --git a/app/assets/javascripts/admin/routes/admin-route-map.js.es6 b/app/assets/javascripts/admin/routes/admin-route-map.js
similarity index 100%
rename from app/assets/javascripts/admin/routes/admin-route-map.js.es6
rename to app/assets/javascripts/admin/routes/admin-route-map.js
diff --git a/app/assets/javascripts/admin/routes/admin-search-logs-index.js.es6 b/app/assets/javascripts/admin/routes/admin-search-logs-index.js
similarity index 100%
rename from app/assets/javascripts/admin/routes/admin-search-logs-index.js.es6
rename to app/assets/javascripts/admin/routes/admin-search-logs-index.js
diff --git a/app/assets/javascripts/admin/routes/admin-search-logs-term.js.es6 b/app/assets/javascripts/admin/routes/admin-search-logs-term.js
similarity index 100%
rename from app/assets/javascripts/admin/routes/admin-search-logs-term.js.es6
rename to app/assets/javascripts/admin/routes/admin-search-logs-term.js
diff --git a/app/assets/javascripts/admin/routes/admin-site-settings-category.js.es6 b/app/assets/javascripts/admin/routes/admin-site-settings-category.js
similarity index 100%
rename from app/assets/javascripts/admin/routes/admin-site-settings-category.js.es6
rename to app/assets/javascripts/admin/routes/admin-site-settings-category.js
diff --git a/app/assets/javascripts/admin/routes/admin-site-settings-index.js.es6 b/app/assets/javascripts/admin/routes/admin-site-settings-index.js
similarity index 100%
rename from app/assets/javascripts/admin/routes/admin-site-settings-index.js.es6
rename to app/assets/javascripts/admin/routes/admin-site-settings-index.js
diff --git a/app/assets/javascripts/admin/routes/admin-site-settings.js.es6 b/app/assets/javascripts/admin/routes/admin-site-settings.js
similarity index 100%
rename from app/assets/javascripts/admin/routes/admin-site-settings.js.es6
rename to app/assets/javascripts/admin/routes/admin-site-settings.js
diff --git a/app/assets/javascripts/admin/routes/admin-site-text-edit.js.es6 b/app/assets/javascripts/admin/routes/admin-site-text-edit.js
similarity index 100%
rename from app/assets/javascripts/admin/routes/admin-site-text-edit.js.es6
rename to app/assets/javascripts/admin/routes/admin-site-text-edit.js
diff --git a/app/assets/javascripts/admin/routes/admin-site-text-index.js.es6 b/app/assets/javascripts/admin/routes/admin-site-text-index.js
similarity index 100%
rename from app/assets/javascripts/admin/routes/admin-site-text-index.js.es6
rename to app/assets/javascripts/admin/routes/admin-site-text-index.js
diff --git a/app/assets/javascripts/admin/routes/admin-user-badges.js.es6 b/app/assets/javascripts/admin/routes/admin-user-badges.js
similarity index 100%
rename from app/assets/javascripts/admin/routes/admin-user-badges.js.es6
rename to app/assets/javascripts/admin/routes/admin-user-badges.js
diff --git a/app/assets/javascripts/admin/routes/admin-user-fields.js.es6 b/app/assets/javascripts/admin/routes/admin-user-fields.js
similarity index 100%
rename from app/assets/javascripts/admin/routes/admin-user-fields.js.es6
rename to app/assets/javascripts/admin/routes/admin-user-fields.js
diff --git a/app/assets/javascripts/admin/routes/admin-user-index.js.es6 b/app/assets/javascripts/admin/routes/admin-user-index.js
similarity index 100%
rename from app/assets/javascripts/admin/routes/admin-user-index.js.es6
rename to app/assets/javascripts/admin/routes/admin-user-index.js
diff --git a/app/assets/javascripts/admin/routes/admin-user-tl3-requirements.js.es6 b/app/assets/javascripts/admin/routes/admin-user-tl3-requirements.js
similarity index 100%
rename from app/assets/javascripts/admin/routes/admin-user-tl3-requirements.js.es6
rename to app/assets/javascripts/admin/routes/admin-user-tl3-requirements.js
diff --git a/app/assets/javascripts/admin/routes/admin-user.js.es6 b/app/assets/javascripts/admin/routes/admin-user.js
similarity index 100%
rename from app/assets/javascripts/admin/routes/admin-user.js.es6
rename to app/assets/javascripts/admin/routes/admin-user.js
diff --git a/app/assets/javascripts/admin/routes/admin-users-index.js.es6 b/app/assets/javascripts/admin/routes/admin-users-index.js
similarity index 100%
rename from app/assets/javascripts/admin/routes/admin-users-index.js.es6
rename to app/assets/javascripts/admin/routes/admin-users-index.js
diff --git a/app/assets/javascripts/admin/routes/admin-users-list-index.js.es6 b/app/assets/javascripts/admin/routes/admin-users-list-index.js
similarity index 100%
rename from app/assets/javascripts/admin/routes/admin-users-list-index.js.es6
rename to app/assets/javascripts/admin/routes/admin-users-list-index.js
diff --git a/app/assets/javascripts/admin/routes/admin-users-list-show.js.es6 b/app/assets/javascripts/admin/routes/admin-users-list-show.js
similarity index 100%
rename from app/assets/javascripts/admin/routes/admin-users-list-show.js.es6
rename to app/assets/javascripts/admin/routes/admin-users-list-show.js
diff --git a/app/assets/javascripts/admin/routes/admin-users-list.js.es6 b/app/assets/javascripts/admin/routes/admin-users-list.js
similarity index 100%
rename from app/assets/javascripts/admin/routes/admin-users-list.js.es6
rename to app/assets/javascripts/admin/routes/admin-users-list.js
diff --git a/app/assets/javascripts/admin/routes/admin-watched-words-action.js.es6 b/app/assets/javascripts/admin/routes/admin-watched-words-action.js
similarity index 100%
rename from app/assets/javascripts/admin/routes/admin-watched-words-action.js.es6
rename to app/assets/javascripts/admin/routes/admin-watched-words-action.js
diff --git a/app/assets/javascripts/admin/routes/admin-watched-words-index.js.es6 b/app/assets/javascripts/admin/routes/admin-watched-words-index.js
similarity index 100%
rename from app/assets/javascripts/admin/routes/admin-watched-words-index.js.es6
rename to app/assets/javascripts/admin/routes/admin-watched-words-index.js
diff --git a/app/assets/javascripts/admin/routes/admin-watched-words.js.es6 b/app/assets/javascripts/admin/routes/admin-watched-words.js
similarity index 100%
rename from app/assets/javascripts/admin/routes/admin-watched-words.js.es6
rename to app/assets/javascripts/admin/routes/admin-watched-words.js
diff --git a/app/assets/javascripts/admin/routes/admin-web-hooks-show-events.js.es6 b/app/assets/javascripts/admin/routes/admin-web-hooks-show-events.js
similarity index 100%
rename from app/assets/javascripts/admin/routes/admin-web-hooks-show-events.js.es6
rename to app/assets/javascripts/admin/routes/admin-web-hooks-show-events.js
diff --git a/app/assets/javascripts/admin/routes/admin-web-hooks-show.js.es6 b/app/assets/javascripts/admin/routes/admin-web-hooks-show.js
similarity index 100%
rename from app/assets/javascripts/admin/routes/admin-web-hooks-show.js.es6
rename to app/assets/javascripts/admin/routes/admin-web-hooks-show.js
diff --git a/app/assets/javascripts/admin/routes/admin-web-hooks.js.es6 b/app/assets/javascripts/admin/routes/admin-web-hooks.js
similarity index 100%
rename from app/assets/javascripts/admin/routes/admin-web-hooks.js.es6
rename to app/assets/javascripts/admin/routes/admin-web-hooks.js
diff --git a/app/assets/javascripts/admin/routes/admin.js.es6 b/app/assets/javascripts/admin/routes/admin.js
similarity index 100%
rename from app/assets/javascripts/admin/routes/admin.js.es6
rename to app/assets/javascripts/admin/routes/admin.js
diff --git a/app/assets/javascripts/admin/services/admin-tools.js.es6 b/app/assets/javascripts/admin/services/admin-tools.js
similarity index 100%
rename from app/assets/javascripts/admin/services/admin-tools.js.es6
rename to app/assets/javascripts/admin/services/admin-tools.js
diff --git a/lib/discourse_js_processor.rb b/lib/discourse_js_processor.rb
index db276e2586e..4056dffc468 100644
--- a/lib/discourse_js_processor.rb
+++ b/lib/discourse_js_processor.rb
@@ -36,7 +36,8 @@ class DiscourseJsProcessor
     return false unless filename.end_with?(".js") || filename.end_with?(".js.erb")
 
     relative_path = filename.sub(Rails.root.to_s, '').sub(/^\/*/, '')
-    relative_path.start_with?("app/assets/javascripts/discourse/")
+    relative_path.start_with?("app/assets/javascripts/discourse/") ||
+      relative_path.start_with?("app/assets/javascripts/admin/")
   end
 
   def self.skip_module?(data)