diff --git a/2021-02-06 cmp-adv-01-starting-setup/src/App.vue b/2021-02-06 cmp-adv-01-starting-setup/src/App.vue
index 996714f..1ddd01a 100644
--- a/2021-02-06 cmp-adv-01-starting-setup/src/App.vue	
+++ b/2021-02-06 cmp-adv-01-starting-setup/src/App.vue	
@@ -20,7 +20,7 @@
 </template>
 
 <script>
-import TheHeader from "./components/TheHeader.vue";
+import TheHeader from "./components/layout/TheHeader.vue";
 import ManageGoals from "./components/ManageGoals";
 import ActiveGoals from "./components/ActiveGoals";
 
diff --git a/2021-02-06 cmp-adv-01-starting-setup/src/components/BaseBadge.vue b/2021-02-06 cmp-adv-01-starting-setup/src/components/base/BaseBadge.vue
similarity index 100%
rename from 2021-02-06 cmp-adv-01-starting-setup/src/components/BaseBadge.vue
rename to 2021-02-06 cmp-adv-01-starting-setup/src/components/base/BaseBadge.vue
diff --git a/2021-02-06 cmp-adv-01-starting-setup/src/components/BaseCard.vue b/2021-02-06 cmp-adv-01-starting-setup/src/components/base/BaseCard.vue
similarity index 100%
rename from 2021-02-06 cmp-adv-01-starting-setup/src/components/BaseCard.vue
rename to 2021-02-06 cmp-adv-01-starting-setup/src/components/base/BaseCard.vue
diff --git a/2021-02-06 cmp-adv-01-starting-setup/src/components/TheHeader.vue b/2021-02-06 cmp-adv-01-starting-setup/src/components/layout/TheHeader.vue
similarity index 100%
rename from 2021-02-06 cmp-adv-01-starting-setup/src/components/TheHeader.vue
rename to 2021-02-06 cmp-adv-01-starting-setup/src/components/layout/TheHeader.vue
diff --git a/2021-02-06 cmp-adv-01-starting-setup/src/main.js b/2021-02-06 cmp-adv-01-starting-setup/src/main.js
index 5c5b0cb..c1673aa 100644
--- a/2021-02-06 cmp-adv-01-starting-setup/src/main.js	
+++ b/2021-02-06 cmp-adv-01-starting-setup/src/main.js	
@@ -1,8 +1,8 @@
 import { createApp } from "vue";
 
 import App from "./App.vue";
-import BaseBadge from "./components/BaseBadge.vue";
-import BaseCard from "./components/BaseCard.vue";
+import BaseBadge from "./components/base/BaseBadge.vue";
+import BaseCard from "./components/base/BaseCard.vue";
 
 const app = createApp(App);