diff --git a/app/assets/javascripts/repo/repo_binary_viewer.vue b/app/assets/javascripts/repo/components/repo_binary_viewer.vue
similarity index 94%
rename from app/assets/javascripts/repo/repo_binary_viewer.vue
rename to app/assets/javascripts/repo/components/repo_binary_viewer.vue
index cc26b49e794..4390c1021a3 100644
--- a/app/assets/javascripts/repo/repo_binary_viewer.vue
+++ b/app/assets/javascripts/repo/components/repo_binary_viewer.vue
@@ -1,6 +1,6 @@
 <script>
-import Store from './repo_store';
-import RepoHelper from './repo_helper';
+import Store from '../stores/repo_store';
+import RepoHelper from '../helpers/repo_helper';
 
 const RepoBinaryViewer = {
   data: () => Store,
diff --git a/app/assets/javascripts/repo/repo_commit_section.vue b/app/assets/javascripts/repo/components/repo_commit_section.vue
similarity index 94%
rename from app/assets/javascripts/repo/repo_commit_section.vue
rename to app/assets/javascripts/repo/components/repo_commit_section.vue
index b4bfd3813c6..2e34633c049 100644
--- a/app/assets/javascripts/repo/repo_commit_section.vue
+++ b/app/assets/javascripts/repo/components/repo_commit_section.vue
@@ -1,9 +1,9 @@
 <script>
 /* global Flash */
-import Store from './repo_store';
-import Api from '../api';
-import RepoMixin from './repo_mixin';
-import Helper from './repo_helper';
+import Store from '../stores/repo_store';
+import Api from '../../api';
+import RepoMixin from '../mixins/repo_mixin';
+import Helper from '../helpers/repo_helper';
 
 const RepoCommitSection = {
   data: () => Store,
diff --git a/app/assets/javascripts/repo/repo_editor.vue b/app/assets/javascripts/repo/components/repo_editor.vue
similarity index 97%
rename from app/assets/javascripts/repo/repo_editor.vue
rename to app/assets/javascripts/repo/components/repo_editor.vue
index 30542e92144..34dde9e588f 100644
--- a/app/assets/javascripts/repo/repo_editor.vue
+++ b/app/assets/javascripts/repo/components/repo_editor.vue
@@ -1,7 +1,7 @@
 <script>
 /* global monaco */
-import Store from './repo_store';
-import Helper from './repo_helper';
+import Store from '../stores/repo_store';
+import Helper from '../helpers/repo_helper';
 
 const RepoEditor = {
   data: () => Store,
diff --git a/app/assets/javascripts/repo/repo_file.vue b/app/assets/javascripts/repo/components/repo_file.vue
similarity index 96%
rename from app/assets/javascripts/repo/repo_file.vue
rename to app/assets/javascripts/repo/components/repo_file.vue
index 143d0281400..bd57c33af6a 100644
--- a/app/assets/javascripts/repo/repo_file.vue
+++ b/app/assets/javascripts/repo/components/repo_file.vue
@@ -1,5 +1,5 @@
 <script>
-import TimeAgoMixin from '../vue_shared/mixins/timeago';
+import TimeAgoMixin from '../../vue_shared/mixins/timeago';
 
 const RepoFile = {
   mixins: [TimeAgoMixin],
diff --git a/app/assets/javascripts/repo/repo_file_buttons.vue b/app/assets/javascripts/repo/components/repo_file_buttons.vue
similarity index 91%
rename from app/assets/javascripts/repo/repo_file_buttons.vue
rename to app/assets/javascripts/repo/components/repo_file_buttons.vue
index e2752e05cf1..effad4cd38c 100644
--- a/app/assets/javascripts/repo/repo_file_buttons.vue
+++ b/app/assets/javascripts/repo/components/repo_file_buttons.vue
@@ -1,7 +1,7 @@
 <script>
-import Store from './repo_store';
-import Helper from './repo_helper';
-import RepoMixin from './repo_mixin';
+import Store from '../stores/repo_store';
+import Helper from '../helpers/repo_helper';
+import RepoMixin from '../mixins/repo_mixin';
 
 const RepoFileButtons = {
   data: () => Store,
diff --git a/app/assets/javascripts/repo/repo_file_options.vue b/app/assets/javascripts/repo/components/repo_file_options.vue
similarity index 100%
rename from app/assets/javascripts/repo/repo_file_options.vue
rename to app/assets/javascripts/repo/components/repo_file_options.vue
diff --git a/app/assets/javascripts/repo/repo_loading_file.vue b/app/assets/javascripts/repo/components/repo_loading_file.vue
similarity index 100%
rename from app/assets/javascripts/repo/repo_loading_file.vue
rename to app/assets/javascripts/repo/components/repo_loading_file.vue
diff --git a/app/assets/javascripts/repo/repo_prev_directory.vue b/app/assets/javascripts/repo/components/repo_prev_directory.vue
similarity index 100%
rename from app/assets/javascripts/repo/repo_prev_directory.vue
rename to app/assets/javascripts/repo/components/repo_prev_directory.vue
diff --git a/app/assets/javascripts/repo/repo_sidebar.vue b/app/assets/javascripts/repo/components/repo_sidebar.vue
similarity index 93%
rename from app/assets/javascripts/repo/repo_sidebar.vue
rename to app/assets/javascripts/repo/components/repo_sidebar.vue
index 11a2cde1169..c6c33952019 100644
--- a/app/assets/javascripts/repo/repo_sidebar.vue
+++ b/app/assets/javascripts/repo/components/repo_sidebar.vue
@@ -1,12 +1,12 @@
 <script>
-import Service from './repo_service';
-import Helper from './repo_helper';
-import Store from './repo_store';
+import Service from '../services/repo_service';
+import Helper from '../helpers/repo_helper';
+import Store from '../stores/repo_store';
 import RepoPreviousDirectory from './repo_prev_directory.vue';
 import RepoFileOptions from './repo_file_options.vue';
 import RepoFile from './repo_file.vue';
 import RepoLoadingFile from './repo_loading_file.vue';
-import RepoMixin from './repo_mixin';
+import RepoMixin from '../mixins/repo_mixin';
 
 const RepoSidebar = {
   mixins: [RepoMixin],
diff --git a/app/assets/javascripts/repo/repo_tab.vue b/app/assets/javascripts/repo/components/repo_tab.vue
similarity index 94%
rename from app/assets/javascripts/repo/repo_tab.vue
rename to app/assets/javascripts/repo/components/repo_tab.vue
index 58fc1e89f57..90685c0f3bb 100644
--- a/app/assets/javascripts/repo/repo_tab.vue
+++ b/app/assets/javascripts/repo/components/repo_tab.vue
@@ -1,5 +1,5 @@
 <script>
-import RepoStore from './repo_store';
+import RepoStore from '../stores/repo_store';
 
 const RepoTab = {
   props: {
diff --git a/app/assets/javascripts/repo/repo_tabs.vue b/app/assets/javascripts/repo/components/repo_tabs.vue
similarity index 89%
rename from app/assets/javascripts/repo/repo_tabs.vue
rename to app/assets/javascripts/repo/components/repo_tabs.vue
index 101054b1977..89ae1d3a7a8 100644
--- a/app/assets/javascripts/repo/repo_tabs.vue
+++ b/app/assets/javascripts/repo/components/repo_tabs.vue
@@ -1,8 +1,8 @@
 <script>
 import Vue from 'vue';
-import Store from './repo_store';
+import Store from '../stores/repo_store';
 import RepoTab from './repo_tab.vue';
-import RepoMixin from './repo_mixin';
+import RepoMixin from '../mixins/repo_mixin';
 
 const RepoTabs = {
   mixins: [RepoMixin],
diff --git a/app/assets/javascripts/repo/repo_helper.js b/app/assets/javascripts/repo/helpers/repo_helper.js
similarity index 98%
rename from app/assets/javascripts/repo/repo_helper.js
rename to app/assets/javascripts/repo/helpers/repo_helper.js
index f58d746c0a8..c81159a1a2b 100644
--- a/app/assets/javascripts/repo/repo_helper.js
+++ b/app/assets/javascripts/repo/helpers/repo_helper.js
@@ -1,7 +1,7 @@
 /* global Flash */
-import Service from './repo_service';
-import Store from './repo_store';
-import '../flash';
+import Service from '../services/repo_service';
+import Store from '../stores/repo_store';
+import '../../flash';
 
 const RepoHelper = {
   getDefaultActiveFile() {
diff --git a/app/assets/javascripts/repo/index.js b/app/assets/javascripts/repo/index.js
index 6fb342e94d6..8de956f0a09 100644
--- a/app/assets/javascripts/repo/index.js
+++ b/app/assets/javascripts/repo/index.js
@@ -2,17 +2,17 @@
 import $ from 'jquery';
 import Vue from 'vue';
 import Translate from '../vue_shared/translate';
-import RepoSidebar from './repo_sidebar.vue';
+import RepoSidebar from './components/repo_sidebar.vue';
 import EditButton from './repo_edit_button';
-import Service from './repo_service';
-import Store from './repo_store';
-import RepoCommitSection from './repo_commit_section.vue';
-import RepoTabs from './repo_tabs.vue';
-import RepoFileButtons from './repo_file_buttons.vue';
-import RepoBinaryViewer from './repo_binary_viewer.vue';
-import RepoEditor from './repo_editor.vue';
+import Service from './services/repo_service';
+import Store from './stores/repo_store';
+import RepoCommitSection from './components/repo_commit_section.vue';
+import RepoTabs from './components/repo_tabs.vue';
+import RepoFileButtons from './components/repo_file_buttons.vue';
+import RepoBinaryViewer from './components/repo_binary_viewer.vue';
+import RepoEditor from './components/repo_editor.vue';
 import monacoLoader from './monaco_loader';
-import RepoMixin from './repo_mixin';
+import RepoMixin from './mixins/repo_mixin';
 import PopupDialog from '../vue_shared/components/popup_dialog.vue';
 
 Vue.use(Translate);
diff --git a/app/assets/javascripts/repo/repo_mixin.js b/app/assets/javascripts/repo/mixins/repo_mixin.js
similarity index 86%
rename from app/assets/javascripts/repo/repo_mixin.js
rename to app/assets/javascripts/repo/mixins/repo_mixin.js
index be5df90b56b..c8e8238a0d3 100644
--- a/app/assets/javascripts/repo/repo_mixin.js
+++ b/app/assets/javascripts/repo/mixins/repo_mixin.js
@@ -1,4 +1,4 @@
-import Store from './repo_store';
+import Store from '../stores/repo_store';
 
 const RepoMixin = {
   computed: {
diff --git a/app/assets/javascripts/repo/repo_edit_button.js b/app/assets/javascripts/repo/repo_edit_button.js
index 0e5b1653195..4495002d441 100644
--- a/app/assets/javascripts/repo/repo_edit_button.js
+++ b/app/assets/javascripts/repo/repo_edit_button.js
@@ -1,6 +1,6 @@
 import Vue from 'vue';
-import Store from './repo_store';
-import RepoMixin from './repo_mixin';
+import Store from './stores/repo_store';
+import RepoMixin from './mixins/repo_mixin';
 import { __ } from '../locale';
 
 export default class RepoEditButton {
diff --git a/app/assets/javascripts/repo/repo_service.js b/app/assets/javascripts/repo/services/repo_service.js
similarity index 97%
rename from app/assets/javascripts/repo/repo_service.js
rename to app/assets/javascripts/repo/services/repo_service.js
index b16640ab4f0..97447181145 100644
--- a/app/assets/javascripts/repo/repo_service.js
+++ b/app/assets/javascripts/repo/services/repo_service.js
@@ -1,5 +1,5 @@
 import axios from 'axios';
-import Store from './repo_store';
+import Store from '../stores/repo_store';
 
 const RepoService = {
   url: '',
diff --git a/app/assets/javascripts/repo/repo_store.js b/app/assets/javascripts/repo/stores/repo_store.js
similarity index 99%
rename from app/assets/javascripts/repo/repo_store.js
rename to app/assets/javascripts/repo/stores/repo_store.js
index ee47c4be5ad..f095e244bcb 100644
--- a/app/assets/javascripts/repo/repo_store.js
+++ b/app/assets/javascripts/repo/stores/repo_store.js
@@ -1,5 +1,5 @@
 /* global Flash */
-import RepoHelper from './repo_helper';
+import RepoHelper from '../helpers/repo_helper';
 
 const RepoStore = {
   ideEl: {},
diff --git a/spec/javascripts/repo/repo_binary_viewer_spec.js b/spec/javascripts/repo/components/repo_binary_viewer_spec.js
similarity index 94%
rename from spec/javascripts/repo/repo_binary_viewer_spec.js
rename to spec/javascripts/repo/components/repo_binary_viewer_spec.js
index abc0706effa..5441bb4f5a1 100644
--- a/spec/javascripts/repo/repo_binary_viewer_spec.js
+++ b/spec/javascripts/repo/components/repo_binary_viewer_spec.js
@@ -1,6 +1,6 @@
 import Vue from 'vue';
-import Store from '~/repo/repo_store';
-import repoBinaryViewer from '~/repo/repo_binary_viewer.vue';
+import Store from '~/repo/stores/repo_store';
+import repoBinaryViewer from '~/repo/components/repo_binary_viewer.vue';
 
 describe('RepoBinaryViewer', () => {
   function createComponent() {
diff --git a/spec/javascripts/repo/repo_commit_section_spec.js b/spec/javascripts/repo/components/repo_commit_section_spec.js
similarity index 95%
rename from spec/javascripts/repo/repo_commit_section_spec.js
rename to spec/javascripts/repo/components/repo_commit_section_spec.js
index 16e5f759297..06e94d7a7f1 100644
--- a/spec/javascripts/repo/repo_commit_section_spec.js
+++ b/spec/javascripts/repo/components/repo_commit_section_spec.js
@@ -1,7 +1,7 @@
 import Vue from 'vue';
-import repoCommitSection from '~/repo/repo_commit_section.vue';
-import RepoStore from '~/repo/repo_store';
-import RepoHelper from '~/repo/repo_helper';
+import repoCommitSection from '~/repo/components/repo_commit_section.vue';
+import RepoStore from '~/repo/stores/repo_store';
+import RepoHelper from '~/repo/helpers/repo_helper';
 import Api from '~/api';
 
 describe('RepoCommitSection', () => {
diff --git a/spec/javascripts/repo/repo_editor_spec.js b/spec/javascripts/repo/components/repo_editor_spec.js
similarity index 85%
rename from spec/javascripts/repo/repo_editor_spec.js
rename to spec/javascripts/repo/components/repo_editor_spec.js
index 541652b3fc0..35e0c995163 100644
--- a/spec/javascripts/repo/repo_editor_spec.js
+++ b/spec/javascripts/repo/components/repo_editor_spec.js
@@ -1,6 +1,6 @@
 import Vue from 'vue';
-import repoEditor from '~/repo/repo_editor.vue';
-import RepoStore from '~/repo/repo_store';
+import repoEditor from '~/repo/components/repo_editor.vue';
+import RepoStore from '~/repo/stores/repo_store';
 
 describe('RepoEditor', () => {
   function createComponent() {
diff --git a/spec/javascripts/repo/repo_file_buttons_spec.js b/spec/javascripts/repo/components/repo_file_buttons_spec.js
similarity index 95%
rename from spec/javascripts/repo/repo_file_buttons_spec.js
rename to spec/javascripts/repo/components/repo_file_buttons_spec.js
index 8de42f908b4..cf5fbe1c1d8 100644
--- a/spec/javascripts/repo/repo_file_buttons_spec.js
+++ b/spec/javascripts/repo/components/repo_file_buttons_spec.js
@@ -1,6 +1,6 @@
 import Vue from 'vue';
-import repoFileButtons from '~/repo/repo_file_buttons.vue';
-import RepoStore from '~/repo/repo_store';
+import repoFileButtons from '~/repo/components/repo_file_buttons.vue';
+import RepoStore from '~/repo/stores/repo_store';
 
 describe('RepoFileButtons', () => {
   function createComponent() {
diff --git a/spec/javascripts/repo/repo_file_options_spec.js b/spec/javascripts/repo/components/repo_file_options_spec.js
similarity index 92%
rename from spec/javascripts/repo/repo_file_options_spec.js
rename to spec/javascripts/repo/components/repo_file_options_spec.js
index cb840851620..86c81e4b5fc 100644
--- a/spec/javascripts/repo/repo_file_options_spec.js
+++ b/spec/javascripts/repo/components/repo_file_options_spec.js
@@ -1,5 +1,5 @@
 import Vue from 'vue';
-import repoFileOptions from '~/repo/repo_file_options.vue';
+import repoFileOptions from '~/repo/components/repo_file_options.vue';
 
 describe('RepoFileOptions', () => {
   const projectName = 'projectName';
diff --git a/spec/javascripts/repo/repo_file_spec.js b/spec/javascripts/repo/components/repo_file_spec.js
similarity index 98%
rename from spec/javascripts/repo/repo_file_spec.js
rename to spec/javascripts/repo/components/repo_file_spec.js
index 2afbb7e99b7..e95ebf2f32a 100644
--- a/spec/javascripts/repo/repo_file_spec.js
+++ b/spec/javascripts/repo/components/repo_file_spec.js
@@ -1,5 +1,5 @@
 import Vue from 'vue';
-import repoFile from '~/repo/repo_file.vue';
+import repoFile from '~/repo/components/repo_file.vue';
 
 describe('RepoFile', () => {
   const updated = 'updated';
diff --git a/spec/javascripts/repo/repo_loading_file_spec.js b/spec/javascripts/repo/components/repo_loading_file_spec.js
similarity index 96%
rename from spec/javascripts/repo/repo_loading_file_spec.js
rename to spec/javascripts/repo/components/repo_loading_file_spec.js
index 190b9024e55..d84f4c5609e 100644
--- a/spec/javascripts/repo/repo_loading_file_spec.js
+++ b/spec/javascripts/repo/components/repo_loading_file_spec.js
@@ -1,5 +1,5 @@
 import Vue from 'vue';
-import repoLoadingFile from '~/repo/repo_loading_file.vue';
+import repoLoadingFile from '~/repo/components/repo_loading_file.vue';
 
 describe('RepoLoadingFile', () => {
   function createComponent(propsData) {
diff --git a/spec/javascripts/repo/repo_prev_directory_spec.js b/spec/javascripts/repo/components/repo_prev_directory_spec.js
similarity index 89%
rename from spec/javascripts/repo/repo_prev_directory_spec.js
rename to spec/javascripts/repo/components/repo_prev_directory_spec.js
index 7a8487c102b..144ab838e7b 100644
--- a/spec/javascripts/repo/repo_prev_directory_spec.js
+++ b/spec/javascripts/repo/components/repo_prev_directory_spec.js
@@ -1,5 +1,5 @@
 import Vue from 'vue';
-import repoPrevDirectory from '~/repo/repo_prev_directory.vue';
+import repoPrevDirectory from '~/repo/components/repo_prev_directory.vue';
 
 describe('RepoPrevDirectory', () => {
   function createComponent(propsData) {
diff --git a/spec/javascripts/repo/repo_sidebar_spec.js b/spec/javascripts/repo/components/repo_sidebar_spec.js
similarity index 94%
rename from spec/javascripts/repo/repo_sidebar_spec.js
rename to spec/javascripts/repo/components/repo_sidebar_spec.js
index 07b3b403976..0d216c9c026 100644
--- a/spec/javascripts/repo/repo_sidebar_spec.js
+++ b/spec/javascripts/repo/components/repo_sidebar_spec.js
@@ -1,6 +1,6 @@
 import Vue from 'vue';
-import RepoStore from '~/repo/repo_store';
-import repoSidebar from '~/repo/repo_sidebar.vue';
+import RepoStore from '~/repo/stores/repo_store';
+import repoSidebar from '~/repo/components/repo_sidebar.vue';
 
 describe('RepoSidebar', () => {
   function createComponent() {
diff --git a/spec/javascripts/repo/repo_tab_spec.js b/spec/javascripts/repo/components/repo_tab_spec.js
similarity index 96%
rename from spec/javascripts/repo/repo_tab_spec.js
rename to spec/javascripts/repo/components/repo_tab_spec.js
index 97ad412e620..0ce11b36bd3 100644
--- a/spec/javascripts/repo/repo_tab_spec.js
+++ b/spec/javascripts/repo/components/repo_tab_spec.js
@@ -1,5 +1,5 @@
 import Vue from 'vue';
-import repoTab from '~/repo/repo_tab.vue';
+import repoTab from '~/repo/components/repo_tab.vue';
 
 describe('RepoTab', () => {
   function createComponent(propsData) {
diff --git a/spec/javascripts/repo/repo_tabs_spec.js b/spec/javascripts/repo/components/repo_tabs_spec.js
similarity index 91%
rename from spec/javascripts/repo/repo_tabs_spec.js
rename to spec/javascripts/repo/components/repo_tabs_spec.js
index 6bf4f0f4498..1a7ccf0f211 100644
--- a/spec/javascripts/repo/repo_tabs_spec.js
+++ b/spec/javascripts/repo/components/repo_tabs_spec.js
@@ -1,6 +1,6 @@
 import Vue from 'vue';
-import RepoStore from '~/repo/repo_store';
-import repoTabs from '~/repo/repo_tabs.vue';
+import RepoStore from '~/repo/stores/repo_store';
+import repoTabs from '~/repo/components/repo_tabs.vue';
 
 describe('RepoTabs', () => {
   const openedFiles = [{
diff --git a/spec/javascripts/repo/repo_service_spec.js b/spec/javascripts/repo/services/repo_service_spec.js
similarity index 98%
rename from spec/javascripts/repo/repo_service_spec.js
rename to spec/javascripts/repo/services/repo_service_spec.js
index fde00056b5c..d74e6a67b1e 100644
--- a/spec/javascripts/repo/repo_service_spec.js
+++ b/spec/javascripts/repo/services/repo_service_spec.js
@@ -1,5 +1,5 @@
 import axios from 'axios';
-import RepoService from '~/repo/repo_service';
+import RepoService from '~/repo/services/repo_service';
 
 describe('RepoService', () => {
   it('has default json format param', () => {