diff --git a/awx/ui/client/src/legacy-styles/angular-scheduler.less b/awx/ui/client/legacy-styles/angular-scheduler.less
similarity index 100%
rename from awx/ui/client/src/legacy-styles/angular-scheduler.less
rename to awx/ui/client/legacy-styles/angular-scheduler.less
diff --git a/awx/ui/client/src/legacy-styles/animations.less b/awx/ui/client/legacy-styles/animations.less
similarity index 100%
rename from awx/ui/client/src/legacy-styles/animations.less
rename to awx/ui/client/legacy-styles/animations.less
diff --git a/awx/ui/client/src/legacy-styles/ansible-ui.less b/awx/ui/client/legacy-styles/ansible-ui.less
similarity index 99%
rename from awx/ui/client/src/legacy-styles/ansible-ui.less
rename to awx/ui/client/legacy-styles/ansible-ui.less
index 987ecf8935..09527af6dc 100644
--- a/awx/ui/client/src/legacy-styles/ansible-ui.less
+++ b/awx/ui/client/legacy-styles/ansible-ui.less
@@ -21,7 +21,7 @@
     src: url(/static/assets/OpenSans-Bold.ttf);
 }
 
-@import "../shared/branding/colors.less";
+@import "src/shared/branding/colors.less";
 @import "fonts.less";
 @import "main-layout.less";
 @import "animations.less";
diff --git a/awx/ui/client/src/legacy-styles/bootstrap-datepicker.less b/awx/ui/client/legacy-styles/bootstrap-datepicker.less
similarity index 100%
rename from awx/ui/client/src/legacy-styles/bootstrap-datepicker.less
rename to awx/ui/client/legacy-styles/bootstrap-datepicker.less
diff --git a/awx/ui/client/src/legacy-styles/breadcrumbs.less b/awx/ui/client/legacy-styles/breadcrumbs.less
similarity index 100%
rename from awx/ui/client/src/legacy-styles/breadcrumbs.less
rename to awx/ui/client/legacy-styles/breadcrumbs.less
diff --git a/awx/ui/client/src/legacy-styles/codemirror.less b/awx/ui/client/legacy-styles/codemirror.less
similarity index 100%
rename from awx/ui/client/src/legacy-styles/codemirror.less
rename to awx/ui/client/legacy-styles/codemirror.less
diff --git a/awx/ui/client/src/legacy-styles/dashboard.less b/awx/ui/client/legacy-styles/dashboard.less
similarity index 100%
rename from awx/ui/client/src/legacy-styles/dashboard.less
rename to awx/ui/client/legacy-styles/dashboard.less
diff --git a/awx/ui/client/src/legacy-styles/event-viewer.less b/awx/ui/client/legacy-styles/event-viewer.less
similarity index 100%
rename from awx/ui/client/src/legacy-styles/event-viewer.less
rename to awx/ui/client/legacy-styles/event-viewer.less
diff --git a/awx/ui/client/src/legacy-styles/fonts.less b/awx/ui/client/legacy-styles/fonts.less
similarity index 100%
rename from awx/ui/client/src/legacy-styles/fonts.less
rename to awx/ui/client/legacy-styles/fonts.less
diff --git a/awx/ui/client/src/legacy-styles/inventory-edit.less b/awx/ui/client/legacy-styles/inventory-edit.less
similarity index 100%
rename from awx/ui/client/src/legacy-styles/inventory-edit.less
rename to awx/ui/client/legacy-styles/inventory-edit.less
diff --git a/awx/ui/client/src/legacy-styles/jPushMenu.less b/awx/ui/client/legacy-styles/jPushMenu.less
similarity index 100%
rename from awx/ui/client/src/legacy-styles/jPushMenu.less
rename to awx/ui/client/legacy-styles/jPushMenu.less
diff --git a/awx/ui/client/src/legacy-styles/job-details.less b/awx/ui/client/legacy-styles/job-details.less
similarity index 100%
rename from awx/ui/client/src/legacy-styles/job-details.less
rename to awx/ui/client/legacy-styles/job-details.less
diff --git a/awx/ui/client/src/legacy-styles/jobs.less b/awx/ui/client/legacy-styles/jobs.less
similarity index 100%
rename from awx/ui/client/src/legacy-styles/jobs.less
rename to awx/ui/client/legacy-styles/jobs.less
diff --git a/awx/ui/client/src/legacy-styles/jquery-ui-overrides.less b/awx/ui/client/legacy-styles/jquery-ui-overrides.less
similarity index 100%
rename from awx/ui/client/src/legacy-styles/jquery-ui-overrides.less
rename to awx/ui/client/legacy-styles/jquery-ui-overrides.less
diff --git a/awx/ui/client/src/legacy-styles/lists.less b/awx/ui/client/legacy-styles/lists.less
similarity index 100%
rename from awx/ui/client/src/legacy-styles/lists.less
rename to awx/ui/client/legacy-styles/lists.less
diff --git a/awx/ui/client/src/legacy-styles/log-viewer.less b/awx/ui/client/legacy-styles/log-viewer.less
similarity index 100%
rename from awx/ui/client/src/legacy-styles/log-viewer.less
rename to awx/ui/client/legacy-styles/log-viewer.less
diff --git a/awx/ui/client/src/legacy-styles/main-layout.less b/awx/ui/client/legacy-styles/main-layout.less
similarity index 100%
rename from awx/ui/client/src/legacy-styles/main-layout.less
rename to awx/ui/client/legacy-styles/main-layout.less
diff --git a/awx/ui/client/src/legacy-styles/portal.less b/awx/ui/client/legacy-styles/portal.less
similarity index 100%
rename from awx/ui/client/src/legacy-styles/portal.less
rename to awx/ui/client/legacy-styles/portal.less
diff --git a/awx/ui/client/src/legacy-styles/stdout.less b/awx/ui/client/legacy-styles/stdout.less
similarity index 100%
rename from awx/ui/client/src/legacy-styles/stdout.less
rename to awx/ui/client/legacy-styles/stdout.less
diff --git a/awx/ui/client/src/legacy-styles/survey-maker.less b/awx/ui/client/legacy-styles/survey-maker.less
similarity index 100%
rename from awx/ui/client/src/legacy-styles/survey-maker.less
rename to awx/ui/client/legacy-styles/survey-maker.less
diff --git a/awx/ui/client/src/legacy-styles/text-label.less b/awx/ui/client/legacy-styles/text-label.less
similarity index 71%
rename from awx/ui/client/src/legacy-styles/text-label.less
rename to awx/ui/client/legacy-styles/text-label.less
index 7be5d65ddb..63aee6c9a3 100644
--- a/awx/ui/client/src/legacy-styles/text-label.less
+++ b/awx/ui/client/legacy-styles/text-label.less
@@ -1,4 +1,4 @@
-@import "../shared/text-label.less";
+@import "src/shared/text-label.less";
 
 .host-disabled-label {
   &:after {
diff --git a/awx/ui/client/src/dashboard/counts/main.less b/awx/ui/client/src/dashboard/counts/main.less
deleted file mode 100644
index 811473e1ff..0000000000
--- a/awx/ui/client/src/dashboard/counts/main.less
+++ /dev/null
@@ -1 +0,0 @@
-@import './dashboard-counts.block.less';
diff --git a/awx/ui/client/src/dashboard/graphs/dashboard-graphs.block.less b/awx/ui/client/src/dashboard/graphs/dashboard-graphs.block.less
index ac0fd66480..4824eec6e8 100644
--- a/awx/ui/client/src/dashboard/graphs/dashboard-graphs.block.less
+++ b/awx/ui/client/src/dashboard/graphs/dashboard-graphs.block.less
@@ -1,6 +1,6 @@
 /** @define DashboardGraphs */
 
-@import "shared/branding/colors.less";
+@import "../../shared/branding/colors.less";
 
 .DashboardGraphs {
     margin-top: 15px;
diff --git a/awx/ui/client/src/dashboard/graphs/main.less b/awx/ui/client/src/dashboard/graphs/main.less
deleted file mode 100644
index c7901b0e61..0000000000
--- a/awx/ui/client/src/dashboard/graphs/main.less
+++ /dev/null
@@ -1 +0,0 @@
-@import './dashboard-graphs.block.less';
diff --git a/awx/ui/client/src/dashboard/lists/job-templates/main.less b/awx/ui/client/src/dashboard/lists/job-templates/main.less
deleted file mode 100644
index 9197b73359..0000000000
--- a/awx/ui/client/src/dashboard/lists/job-templates/main.less
+++ /dev/null
@@ -1 +0,0 @@
-@import './job-templates-list.block.less';
diff --git a/awx/ui/client/src/dashboard/lists/main.less b/awx/ui/client/src/dashboard/lists/main.less
deleted file mode 100644
index b5d6d15f17..0000000000
--- a/awx/ui/client/src/dashboard/lists/main.less
+++ /dev/null
@@ -1 +0,0 @@
-@import './job-templates/main';
diff --git a/awx/ui/client/src/dashboard/main.less b/awx/ui/client/src/dashboard/main.less
deleted file mode 100644
index 72fca4d3ca..0000000000
--- a/awx/ui/client/src/dashboard/main.less
+++ /dev/null
@@ -1,4 +0,0 @@
-@import './counts/main';
-@import './graphs/main';
-@import './lists/main';
-@import './dashboard.block.less';
diff --git a/awx/ui/client/src/jobs/main.less b/awx/ui/client/src/jobs/main.less
deleted file mode 100644
index 84e372afad..0000000000
--- a/awx/ui/client/src/jobs/main.less
+++ /dev/null
@@ -1 +0,0 @@
-@import './standard-out-details.block.less';
diff --git a/awx/ui/client/src/main-menu/main.less b/awx/ui/client/src/main-menu/main.less
deleted file mode 100644
index 6038e65369..0000000000
--- a/awx/ui/client/src/main-menu/main.less
+++ /dev/null
@@ -1,5 +0,0 @@
-@import '../shared/button.block.less';
-
-@import './menu-item.block.less';
-@import './menu-item.block.less';
-@import './main-menu.block.less';
diff --git a/awx/ui/client/src/main-menu/menu-item.block.less b/awx/ui/client/src/main-menu/menu-item.block.less
index 587ad03899..e9c258c558 100644
--- a/awx/ui/client/src/main-menu/menu-item.block.less
+++ b/awx/ui/client/src/main-menu/menu-item.block.less
@@ -1,7 +1,7 @@
 /** @define MenuItem */
 
-@import (reference) "shared/utilities/icons.less";
-@import "shared/branding/colors.less";
+@import (reference) "../shared/utilities/icons.less";
+@import "../shared/branding/colors.less";
 
 .MenuItem {
   @menu-breakpoint: 870px;
diff --git a/awx/ui/client/src/main.less b/awx/ui/client/src/main.less
deleted file mode 100644
index 57d666a45c..0000000000
--- a/awx/ui/client/src/main.less
+++ /dev/null
@@ -1,8 +0,0 @@
-@import './legacy-styles/ansible-ui';
-
-@import './dashboard/main';
-@import './jobs/main';
-@import './main-menu/main';
-@import './setup-menu/main';
-@import './system-tracking/main';
-
diff --git a/awx/ui/client/src/setup-menu/hover-icon.block.less b/awx/ui/client/src/setup-menu/hover-icon.block.less
index 022e29ac5f..b1042651f2 100644
--- a/awx/ui/client/src/setup-menu/hover-icon.block.less
+++ b/awx/ui/client/src/setup-menu/hover-icon.block.less
@@ -1,6 +1,6 @@
 /** @define HoverIcon */
 
-@import 'shared/branding/colors.less';
+@import '../shared/branding/colors.less';
 
 .HoverIcon {
   @media screen and (max-width: 571px) {
diff --git a/awx/ui/client/src/setup-menu/main.less b/awx/ui/client/src/setup-menu/main.less
deleted file mode 100644
index cac5024958..0000000000
--- a/awx/ui/client/src/setup-menu/main.less
+++ /dev/null
@@ -1,7 +0,0 @@
-@import '../shared/media-object.block.less';
-@import '../shared/container/container.block.less';
-
-@import './hover-icon.block.less';
-@import './setup-extra.block.less';
-@import './setup-item.block.less';
-@import './setup-menu.block.less';
diff --git a/awx/ui/client/src/setup-menu/setup-item.block.less b/awx/ui/client/src/setup-menu/setup-item.block.less
index d983c5bd7a..e0437816c8 100644
--- a/awx/ui/client/src/setup-menu/setup-item.block.less
+++ b/awx/ui/client/src/setup-menu/setup-item.block.less
@@ -1,6 +1,6 @@
 /** @define SetupItem */
 
-@import 'shared/branding/colors.less';
+@import '../shared/branding/colors.less';
 
 .SetupItem {
 
diff --git a/awx/ui/client/src/setup-menu/setup-menu.block.less b/awx/ui/client/src/setup-menu/setup-menu.block.less
index 1e2b2f8240..bb5bccaec5 100644
--- a/awx/ui/client/src/setup-menu/setup-menu.block.less
+++ b/awx/ui/client/src/setup-menu/setup-menu.block.less
@@ -1,6 +1,6 @@
 /** @define SetupMenu */
 
-@import "shared/branding/colors.less";
+@import "../shared/branding/colors.less";
 @menu-breakpoint: 710px;
 
 .SetupMenu {
diff --git a/awx/ui/client/src/shared/button.block.less b/awx/ui/client/src/shared/button.block.less
index dceb1d51d2..eb23cf99d7 100644
--- a/awx/ui/client/src/shared/button.block.less
+++ b/awx/ui/client/src/shared/button.block.less
@@ -1,6 +1,6 @@
 /** @define Button */
 
-@import 'shared/branding/colors.less';
+@import '../shared/branding/colors.less';
 
 .Button {
     &--pseudo {
diff --git a/awx/ui/client/src/system-tracking/date-picker/main.less b/awx/ui/client/src/system-tracking/date-picker/main.less
deleted file mode 100644
index 82a0ee8dd1..0000000000
--- a/awx/ui/client/src/system-tracking/date-picker/main.less
+++ /dev/null
@@ -1 +0,0 @@
-@import './date-picker.block.less';
diff --git a/awx/ui/client/src/system-tracking/fact-data-table/fact-data-error.block.less b/awx/ui/client/src/system-tracking/fact-data-table/fact-data-error.block.less
index 301ab13d48..2fbd166b77 100644
--- a/awx/ui/client/src/system-tracking/fact-data-table/fact-data-error.block.less
+++ b/awx/ui/client/src/system-tracking/fact-data-table/fact-data-error.block.less
@@ -1,6 +1,6 @@
 /** @define FactDataError */
 
-@import "shared/branding/colors.less";
+@import "../../shared/branding/colors.less";
 
 .FactDataError {
     display: flex;
diff --git a/awx/ui/client/src/system-tracking/fact-data-table/fact-data-group.block.less b/awx/ui/client/src/system-tracking/fact-data-table/fact-data-group.block.less
index c93416abaa..664b7b09a2 100644
--- a/awx/ui/client/src/system-tracking/fact-data-table/fact-data-group.block.less
+++ b/awx/ui/client/src/system-tracking/fact-data-table/fact-data-group.block.less
@@ -6,7 +6,7 @@
 
 /** @define FactDataGroup */
 
-@import 'shared/text-label.less';
+@import '../../shared/text-label.less';
 
 .FactDataGroup {
     &-headings {
diff --git a/awx/ui/client/src/system-tracking/fact-data-table/main.less b/awx/ui/client/src/system-tracking/fact-data-table/main.less
deleted file mode 100644
index 30a28de9ba..0000000000
--- a/awx/ui/client/src/system-tracking/fact-data-table/main.less
+++ /dev/null
@@ -1,4 +0,0 @@
-@import './fact-data-table.block.less';
-@import './fact-data-table-heading.block.less';
-@import './fact-data-error.block.less';
-@import './fact-data-group.block.less';
diff --git a/awx/ui/client/src/system-tracking/fact-module-filter.block.less b/awx/ui/client/src/system-tracking/fact-module-filter.block.less
index 972f932e81..81361f68bb 100644
--- a/awx/ui/client/src/system-tracking/fact-module-filter.block.less
+++ b/awx/ui/client/src/system-tracking/fact-module-filter.block.less
@@ -1,6 +1,6 @@
 /** @define FactModuleFilter */
 
-@import "shared/branding/colors.less";
+@import "../shared/branding/colors.less";
 
 .FactModuleFilter {
     width: 100%;
diff --git a/awx/ui/client/src/system-tracking/main.less b/awx/ui/client/src/system-tracking/main.less
deleted file mode 100644
index 17186ce6b5..0000000000
--- a/awx/ui/client/src/system-tracking/main.less
+++ /dev/null
@@ -1,5 +0,0 @@
-@import './date-picker/main';
-@import './fact-data-table/main';
-@import './fact-module-filter.block.less';
-@import './fact-module-pickers.block.less';
-@import './system-tracking-container.block.less';
diff --git a/awx/ui/client/src/tooltip/tooltip.block.less b/awx/ui/client/src/tooltip/tooltip.block.less
index e7965e954d..5ebfee4738 100644
--- a/awx/ui/client/src/tooltip/tooltip.block.less
+++ b/awx/ui/client/src/tooltip/tooltip.block.less
@@ -1,6 +1,6 @@
 /** @define Tooltip */
 
-@import "shared/branding/colors.less";
+@import "../shared/branding/colors.less";
 .Tooltip-inner {
     white-space: pre-wrap;
     word-break: break-word;