diff --git a/src/services/Bag.ts b/src/services/Bag.ts
index dbaa011..a59422f 100644
--- a/src/services/Bag.ts
+++ b/src/services/Bag.ts
@@ -1,4 +1,4 @@
-import { BagPersistence } from '@/store'
+import { BagPersistence } from '@/store/state'
 import { shuffle } from 'lodash'
 import Follower from './enum/Follower'
 
diff --git a/src/services/Bot.ts b/src/services/Bot.ts
index a7752dd..1bd2d80 100644
--- a/src/services/Bot.ts
+++ b/src/services/Bot.ts
@@ -1,10 +1,10 @@
 import { clone, reverse } from 'lodash'
-import Bag from './Bag';
-import CardDeck from './CardDeck';
-import Action from './enum/Action';
+import Bag from './Bag'
+import CardDeck from './CardDeck'
+import Action from './enum/Action'
 import DifficultyLevel from './enum/DifficultyLevel'
-import Direction from './enum/Direction';
-import Follower from './enum/Follower';
+import Direction from './enum/Direction'
+import Follower from './enum/Follower'
 
 /**
  * Picks follower tile and determines the actions based on the currend card and difficulty level.
diff --git a/src/services/Card.ts b/src/services/Card.ts
index 0409920..8c4e648 100644
--- a/src/services/Card.ts
+++ b/src/services/Card.ts
@@ -1,7 +1,7 @@
-import Action from './enum/Action';
-import DifficultyLevel from './enum/DifficultyLevel';
-import Direction from './enum/Direction';
-import Follower from './enum/Follower';
+import Action from './enum/Action'
+import DifficultyLevel from './enum/DifficultyLevel'
+import Direction from './enum/Direction'
+import Follower from './enum/Follower'
 
 export default interface Card {
   id: string,
diff --git a/src/services/CardDeck.ts b/src/services/CardDeck.ts
index 50f55a0..337ed56 100644
--- a/src/services/CardDeck.ts
+++ b/src/services/CardDeck.ts
@@ -1,4 +1,4 @@
-import { CardDeckPersistence } from '@/store'
+import { CardDeckPersistence } from '@/store/state'
 import { shuffle } from 'lodash'
 import Card from './Card'
 import Cards from './Cards'
diff --git a/src/services/Cards.ts b/src/services/Cards.ts
index 5a5c9bb..fdfb0ed 100644
--- a/src/services/Cards.ts
+++ b/src/services/Cards.ts
@@ -1,9 +1,9 @@
-import findMandatory from 'brdgm-commons/src/util/map/findMandatory';
-import Card from './Card';
-import Action from './enum/Action';
-import DifficultyLevel from './enum/DifficultyLevel';
-import Direction from './enum/Direction';
-import Follower from './enum/Follower';
+import findMandatory from 'brdgm-commons/src/util/map/findMandatory'
+import Card from './Card'
+import Action from './enum/Action'
+import DifficultyLevel from './enum/DifficultyLevel'
+import Direction from './enum/Direction'
+import Follower from './enum/Follower'
 
 const cards = [
   {