diff --git a/src/components/Battleground.vue b/src/components/Battleground.vue
index dadcad7..b8fa604 100644
--- a/src/components/Battleground.vue
+++ b/src/components/Battleground.vue
@@ -36,8 +36,8 @@
 
 <script>
   import BATTLEGROUNDS from '@/gameInfos/battlegrounds'
-  import Timer from '@/components/Battleground/Timer'
-  import Objective from '@/components/Battleground/Objective'
+  import Timer from '@/components/Timer'
+  import Objective from '@/components/Objective'
 
   export default {
     name: 'Battleground',
diff --git a/src/components/Battleground/Objective.vue b/src/components/Objective.vue
similarity index 94%
rename from src/components/Battleground/Objective.vue
rename to src/components/Objective.vue
index 3409e9c..8bcfd49 100644
--- a/src/components/Battleground/Objective.vue
+++ b/src/components/Objective.vue
@@ -25,7 +25,7 @@
 </style>
 
 <script>
-  import Timer from '@/components/Battleground/Timer'
+  import Timer from '@/components/Timer'
   export default {
     name: 'Objective',
     props: {
diff --git a/src/components/BattlegroundSelector.vue b/src/components/TheBattlegroundSelector.vue
similarity index 100%
rename from src/components/BattlegroundSelector.vue
rename to src/components/TheBattlegroundSelector.vue
diff --git a/src/components/Battleground/Timer.vue b/src/components/Timer.vue
similarity index 100%
rename from src/components/Battleground/Timer.vue
rename to src/components/Timer.vue
diff --git a/src/router/index.js b/src/router/index.js
index 9e1d530..5fe02e0 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -2,7 +2,7 @@ import Vue from 'vue'
 import Router from 'vue-router'
 
 import Hello from '@/components/Hello'
-import BattlegroundSelector from '@/components/BattlegroundSelector'
+import TheBattlegroundSelector from '@/components/TheBattlegroundSelector'
 import Battleground from '@/components/Battleground'
 
 Vue.use(Router)
@@ -16,7 +16,7 @@ export default new Router({
     },
     {
       path: '/battlegrounds',
-      component: BattlegroundSelector
+      component: TheBattlegroundSelector
     },
     {
       path: '/battleground/:battlegroundId',