diff --git a/src/assets/styles/_helpers.scss b/src/assets/styles/_helpers.scss
index f01c00b..8c225ab 100644
--- a/src/assets/styles/_helpers.scss
+++ b/src/assets/styles/_helpers.scss
@@ -1,3 +1,3 @@
 // Import required for all single file components that use Sass variables
 @import "./bmc/helpers";
-@import "./vendor/bootstrap/helpers";
+@import "./bootstrap/helpers";
diff --git a/src/assets/styles/_obmc-custom.scss b/src/assets/styles/_obmc-custom.scss
index ae4fcb9..c063458 100644
--- a/src/assets/styles/_obmc-custom.scss
+++ b/src/assets/styles/_obmc-custom.scss
@@ -3,19 +3,11 @@
 // statement. Moving this helper after results in Bootstrap
 // variables taking precedence over BMC's
 @import "./bmc/helpers";
-@import "./vendor/bootstrap/helpers";
+@import "./bootstrap/helpers";
 
-// BMC Base files must follow Bootstrap base files
-// to assure BMC base styles override Bootstrap base files
-@import "./vendor/bootstrap/base";
-@import "./bmc/base";
+// Vendor styles
+@import "./bootstrap";
+@import "~bootstrap-vue/src/index";
 
-// Conmponents and Utilities from the third-party
-// libraries follow base files
-@import "./vendor/bootstrap/components";
-@import "./vendor/bootstrap/utils";
-@import "./vendor/bootstrap-vue/index";
-
-// Vendor overrides must be the last file imported
-@import "./vendor-overrides/bootstrap/index";
-@import "./vendor-overrides/bootstrap-vue/index";
+// Custom BMC styles
+@import "./bmc/custom";
diff --git a/src/assets/styles/bmc/_helpers.scss b/src/assets/styles/bmc/_helpers.scss
deleted file mode 100644
index 217c90e..0000000
--- a/src/assets/styles/bmc/_helpers.scss
+++ /dev/null
@@ -1,3 +0,0 @@
-@import "./helpers/colors";
-@import "./helpers/motion";
-@import "./helpers/variables";
\ No newline at end of file
diff --git a/src/assets/styles/vendor-overrides/bootstrap/_alert.scss b/src/assets/styles/bmc/custom/_alert.scss
similarity index 100%
rename from src/assets/styles/vendor-overrides/bootstrap/_alert.scss
rename to src/assets/styles/bmc/custom/_alert.scss
diff --git a/src/assets/styles/vendor-overrides/bootstrap/_badge.scss b/src/assets/styles/bmc/custom/_badge.scss
similarity index 100%
rename from src/assets/styles/vendor-overrides/bootstrap/_badge.scss
rename to src/assets/styles/bmc/custom/_badge.scss
diff --git a/src/assets/styles/bmc/_base.scss b/src/assets/styles/bmc/custom/_base.scss
similarity index 100%
rename from src/assets/styles/bmc/_base.scss
rename to src/assets/styles/bmc/custom/_base.scss
diff --git a/src/assets/styles/vendor-overrides/bootstrap/_bootstrap-grid.scss b/src/assets/styles/bmc/custom/_bootstrap-grid.scss
similarity index 100%
rename from src/assets/styles/vendor-overrides/bootstrap/_bootstrap-grid.scss
rename to src/assets/styles/bmc/custom/_bootstrap-grid.scss
diff --git a/src/assets/styles/vendor-overrides/bootstrap/_buttons.scss b/src/assets/styles/bmc/custom/_buttons.scss
similarity index 100%
rename from src/assets/styles/vendor-overrides/bootstrap/_buttons.scss
rename to src/assets/styles/bmc/custom/_buttons.scss
diff --git a/src/assets/styles/vendor-overrides/bootstrap-vue/_calendar.scss b/src/assets/styles/bmc/custom/_calendar.scss
similarity index 100%
rename from src/assets/styles/vendor-overrides/bootstrap-vue/_calendar.scss
rename to src/assets/styles/bmc/custom/_calendar.scss
diff --git a/src/assets/styles/vendor-overrides/bootstrap/_dropdown.scss b/src/assets/styles/bmc/custom/_dropdown.scss
similarity index 100%
rename from src/assets/styles/vendor-overrides/bootstrap/_dropdown.scss
rename to src/assets/styles/bmc/custom/_dropdown.scss
diff --git a/src/assets/styles/vendor-overrides/bootstrap/_forms.scss b/src/assets/styles/bmc/custom/_forms.scss
similarity index 100%
rename from src/assets/styles/vendor-overrides/bootstrap/_forms.scss
rename to src/assets/styles/bmc/custom/_forms.scss
diff --git a/src/assets/styles/vendor-overrides/bootstrap/_index.scss b/src/assets/styles/bmc/custom/_index.scss
similarity index 87%
rename from src/assets/styles/vendor-overrides/bootstrap/_index.scss
rename to src/assets/styles/bmc/custom/_index.scss
index 8f80e5c..0c393c5 100644
--- a/src/assets/styles/vendor-overrides/bootstrap/_index.scss
+++ b/src/assets/styles/bmc/custom/_index.scss
@@ -2,8 +2,10 @@
 // Bootstrap styles
 @import "./alert";
 @import "./badge";
+@import "./base";
 @import "./bootstrap-grid";
 @import "./buttons";
+@import "./calendar";
 @import "./dropdown";
 @import "./forms";
 @import "./modal";
diff --git a/src/assets/styles/vendor-overrides/bootstrap/_modal.scss b/src/assets/styles/bmc/custom/_modal.scss
similarity index 100%
rename from src/assets/styles/vendor-overrides/bootstrap/_modal.scss
rename to src/assets/styles/bmc/custom/_modal.scss
diff --git a/src/assets/styles/vendor-overrides/bootstrap/_pagination.scss b/src/assets/styles/bmc/custom/_pagination.scss
similarity index 100%
rename from src/assets/styles/vendor-overrides/bootstrap/_pagination.scss
rename to src/assets/styles/bmc/custom/_pagination.scss
diff --git a/src/assets/styles/vendor-overrides/bootstrap/_tables.scss b/src/assets/styles/bmc/custom/_tables.scss
similarity index 100%
rename from src/assets/styles/vendor-overrides/bootstrap/_tables.scss
rename to src/assets/styles/bmc/custom/_tables.scss
diff --git a/src/assets/styles/vendor-overrides/bootstrap/_toasts.scss b/src/assets/styles/bmc/custom/_toasts.scss
similarity index 100%
rename from src/assets/styles/vendor-overrides/bootstrap/_toasts.scss
rename to src/assets/styles/bmc/custom/_toasts.scss
diff --git a/src/assets/styles/bmc/helpers/_index.scss b/src/assets/styles/bmc/helpers/_index.scss
new file mode 100644
index 0000000..e4abf9c
--- /dev/null
+++ b/src/assets/styles/bmc/helpers/_index.scss
@@ -0,0 +1,3 @@
+@import "./colors";
+@import "./motion";
+@import "./variables";
\ No newline at end of file
diff --git a/src/assets/styles/vendor/bootstrap/_helpers.scss b/src/assets/styles/bootstrap/_helpers.scss
similarity index 100%
rename from src/assets/styles/vendor/bootstrap/_helpers.scss
rename to src/assets/styles/bootstrap/_helpers.scss
diff --git a/src/assets/styles/vendor/bootstrap/_components.scss b/src/assets/styles/bootstrap/_index.scss
similarity index 78%
rename from src/assets/styles/vendor/bootstrap/_components.scss
rename to src/assets/styles/bootstrap/_index.scss
index 8341cdc..847e83e 100644
--- a/src/assets/styles/vendor/bootstrap/_components.scss
+++ b/src/assets/styles/bootstrap/_index.scss
@@ -1,3 +1,10 @@
+// Base
+@import "~bootstrap/scss/root";
+@import "~bootstrap/scss/reboot";
+@import "~bootstrap/scss/transitions";
+@import "~bootstrap/scss/type";
+
+// Components
 @import "~bootstrap/scss/alert";
 @import "~bootstrap/scss/badge";
 @import "~bootstrap/scss/breadcrumb";
@@ -23,4 +30,8 @@
 @import "~bootstrap/scss/spinners";
 @import "~bootstrap/scss/tables";
 @import "~bootstrap/scss/toasts";
-@import "~bootstrap/scss/tooltip";
\ No newline at end of file
+@import "~bootstrap/scss/tooltip";
+
+// Utils
+@import "~bootstrap/scss/utilities";
+@import "~bootstrap/scss/print";
\ No newline at end of file
diff --git a/src/assets/styles/vendor-overrides/bootstrap-vue/_index.scss b/src/assets/styles/vendor-overrides/bootstrap-vue/_index.scss
deleted file mode 100644
index a665814..0000000
--- a/src/assets/styles/vendor-overrides/bootstrap-vue/_index.scss
+++ /dev/null
@@ -1 +0,0 @@
-@import "./calendar";
diff --git a/src/assets/styles/vendor/bootstrap-vue/_index.scss b/src/assets/styles/vendor/bootstrap-vue/_index.scss
deleted file mode 100644
index c10e1f0..0000000
--- a/src/assets/styles/vendor/bootstrap-vue/_index.scss
+++ /dev/null
@@ -1 +0,0 @@
-@import "~bootstrap-vue/src/index";
diff --git a/src/assets/styles/vendor/bootstrap/_base.scss b/src/assets/styles/vendor/bootstrap/_base.scss
deleted file mode 100644
index 1af0344..0000000
--- a/src/assets/styles/vendor/bootstrap/_base.scss
+++ /dev/null
@@ -1,4 +0,0 @@
-@import "~bootstrap/scss/root";
-@import "~bootstrap/scss/reboot";
-@import "~bootstrap/scss/transitions";
-@import "~bootstrap/scss/type";
\ No newline at end of file
diff --git a/src/assets/styles/vendor/bootstrap/_utils.scss b/src/assets/styles/vendor/bootstrap/_utils.scss
deleted file mode 100644
index f0b5c44..0000000
--- a/src/assets/styles/vendor/bootstrap/_utils.scss
+++ /dev/null
@@ -1,2 +0,0 @@
-@import "~bootstrap/scss/utilities";
-@import "~bootstrap/scss/print";
\ No newline at end of file