diff --git a/src/api/overlays/ProgressDialog.js b/src/api/overlays/ProgressDialog.js
index 330796cd92..db72259791 100644
--- a/src/api/overlays/ProgressDialog.js
+++ b/src/api/overlays/ProgressDialog.js
@@ -1,4 +1,4 @@
-import ProgressComponent from '../../ui/components/layout/ProgressBar.vue';
+import ProgressComponent from '../../ui/components/ProgressBar.vue';
 import Overlay from './Overlay';
 import Vue from 'vue';
 
diff --git a/src/plugins/folderView/components/GridItem.vue b/src/plugins/folderView/components/GridItem.vue
index 5f9ea195bf..3ec1fe00e7 100644
--- a/src/plugins/folderView/components/GridItem.vue
+++ b/src/plugins/folderView/components/GridItem.vue
@@ -149,8 +149,8 @@
 </style>
 
 <script>
-import contextMenuGesture from '../../../ui/components/mixins/context-menu-gesture';
-import objectLink from '../../../ui/components/mixins/object-link';
+import contextMenuGesture from '../../../ui/mixins/context-menu-gesture';
+import objectLink from '../../../ui/mixins/object-link';
 
 export default {
     mixins: [contextMenuGesture, objectLink],
diff --git a/src/plugins/folderView/components/ListItem.vue b/src/plugins/folderView/components/ListItem.vue
index 50d666afe4..0b678fa813 100644
--- a/src/plugins/folderView/components/ListItem.vue
+++ b/src/plugins/folderView/components/ListItem.vue
@@ -54,8 +54,8 @@
 <script>
 
 import moment from 'moment';
-import contextMenuGesture from '../../../ui/components/mixins/context-menu-gesture';
-import objectLink from '../../../ui/components/mixins/object-link';
+import contextMenuGesture from '../../../ui/mixins/context-menu-gesture';
+import objectLink from '../../../ui/mixins/object-link';
 
 export default {
     mixins: [contextMenuGesture, objectLink],
diff --git a/src/plugins/notebook/src/controllers/NotebookController.js b/src/plugins/notebook/src/controllers/NotebookController.js
index 8ca414bd0f..bf2deccf2b 100644
--- a/src/plugins/notebook/src/controllers/NotebookController.js
+++ b/src/plugins/notebook/src/controllers/NotebookController.js
@@ -27,7 +27,7 @@ define([
     '../../res/templates/notebook.html',
     '../../res/templates/entry.html',
     '../../res/templates/embed.html',
-    '../../../../ui/components/controls/search.vue'
+    '../../../../ui/components/search.vue'
 ],
 function (
     Vue,
diff --git a/src/plugins/preview/Preview.vue b/src/plugins/preview/Preview.vue
index 098321a86f..183179c399 100644
--- a/src/plugins/preview/Preview.vue
+++ b/src/plugins/preview/Preview.vue
@@ -62,7 +62,7 @@
 </style>
 
  <script>
-    import ContextMenuDropDown from '../../ui/components/controls/contextMenuDropDown.vue';
+    import ContextMenuDropDown from '../../ui/components/contextMenuDropDown.vue';
 
     export default {
         components: {
@@ -73,7 +73,7 @@
             'objectPath'
         ],
         data() {
-            let domainObject = this.objectPath[0]; 
+            let domainObject = this.objectPath[0];
             let type = this.openmct.types.get(domainObject.type);
 
             return {
diff --git a/src/plugins/tabs/components/tabs.vue b/src/plugins/tabs/components/tabs.vue
index 1a461d9185..0122ea7303 100644
--- a/src/plugins/tabs/components/tabs.vue
+++ b/src/plugins/tabs/components/tabs.vue
@@ -15,14 +15,14 @@
                 v-for="(tab,index) in tabsList"
                 :key="index"
                 :class="[
-                    {'is-current': tab=== currentTab}, 
+                    {'is-current': tab=== currentTab},
                     tab.type.definition.cssClass
                 ]"
                 @click="showTab(tab)">
                 <span class="c-button__label">{{tab.model.name}}</span>
             </button>
         </div>
-        <div class="c-tabs-view__object-holder" 
+        <div class="c-tabs-view__object-holder"
             v-for="(object, index) in tabsList"
             :key="index"
             :class="{'invisible': object !== currentTab}">
@@ -86,7 +86,7 @@
 </style>
 
 <script>
-import ObjectView from '../../../ui/components/layout/ObjectView.vue';
+import ObjectView from '../../../ui/components/ObjectView.vue';
 
 var unknownObjectType = {
     definition: {
diff --git a/src/plugins/telemetryTable/components/table.vue b/src/plugins/telemetryTable/components/table.vue
index 154475e46f..770270472e 100644
--- a/src/plugins/telemetryTable/components/table.vue
+++ b/src/plugins/telemetryTable/components/table.vue
@@ -35,7 +35,7 @@
         <table class="c-table__headers c-telemetry-table__headers">
             <thead>
                 <tr>
-                    <table-column-header 
+                    <table-column-header
                         v-for="(title, key, headerIndex) in headers"
                         :key="key"
                         :headerKey="key"
@@ -219,7 +219,7 @@
 
 <script>
 import TelemetryTableRow from './table-row.vue';
-import search from '../../../ui/components/controls/search.vue';
+import search from '../../../ui/components/search.vue';
 import TableColumnHeader from './table-column-header.vue';
 import _ from 'lodash';
 
@@ -462,7 +462,7 @@ export default {
         },
         updateConfiguration(configuration) {
             this.isAutosizeEnabled = configuration.autosize;
-            
+
             this.updateHeaders();
             this.$nextTick().then(this.calculateColumnWidths);
         },
@@ -539,7 +539,7 @@ export default {
         this.filterChanged = _.debounce(this.filterChanged, 500);
     },
     mounted() {
-        
+
         this.table.on('object-added', this.addObject);
         this.table.on('object-removed', this.removeObject);
         this.table.on('outstanding-requests', this.outstandingRequests);
diff --git a/src/ui/layout/ProgressBar.vue b/src/ui/components/ProgressBar.vue
similarity index 100%
rename from src/ui/layout/ProgressBar.vue
rename to src/ui/components/ProgressBar.vue
diff --git a/src/ui/layout/status-bar/NotificationBanner.vue b/src/ui/layout/status-bar/NotificationBanner.vue
index daf7b5a3bf..42dc674f56 100644
--- a/src/ui/layout/status-bar/NotificationBanner.vue
+++ b/src/ui/layout/status-bar/NotificationBanner.vue
@@ -104,7 +104,7 @@
 </style>
 
 <script>
-    import ProgressBar from '../ProgressBar.vue';
+    import ProgressBar from '../../components/ProgressBar.vue';
     let activeNotification = undefined;
     let dialogService = undefined;
     let maximizedDialog = undefined;