diff --git a/src/App.vue b/src/App.vue
index 6f4dec4..1c4de4d 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -7,7 +7,8 @@
 import {defineComponent, computed, ref} from 'vue';
 import Leaflet from './components/Leaflet.vue';
 import Sidebar from './components/Sidebar.vue';
-import {ActionTypes, useStore} from "./store";
+import {useStore} from "./store";
+import {ActionTypes} from "@/store/action-types";
 
 export default defineComponent({
 	name: 'WorldList',
@@ -40,7 +41,7 @@ export default defineComponent({
 
 	methods: {
 		loadConfiguration() {
-			useStore().dispatch(ActionTypes.LOAD_CONFIGRUATION, undefined).then(() => {
+			useStore().dispatch(ActionTypes.LOAD_CONFIGURATION, undefined).then(() => {
 				this.startUpdates();
 			});
 		},
diff --git a/src/components/WorldListItem.vue b/src/components/WorldListItem.vue
index af34bdb..fe44608 100644
--- a/src/components/WorldListItem.vue
+++ b/src/components/WorldListItem.vue
@@ -10,9 +10,10 @@
 </template>
 
 <script lang="ts">
-import {MutationTypes, useStore} from "@/store";
+import {useStore} from "@/store";
 import {DynmapMap, DynmapWorld} from "@/dynmap";
 import {defineComponent} from 'vue';
+import {MutationTypes} from "@/store/mutation-types";
 
 export default defineComponent({
 	name: 'WorldListItem',
diff --git a/src/store/action-types.ts b/src/store/action-types.ts
new file mode 100644
index 0000000..cdb0b41
--- /dev/null
+++ b/src/store/action-types.ts
@@ -0,0 +1,4 @@
+export enum ActionTypes {
+	LOAD_CONFIGURATION = "loadConfiguration",
+	GET_UPDATE = "getUpdate",
+}
\ No newline at end of file
diff --git a/src/store/actions.ts b/src/store/actions.ts
new file mode 100644
index 0000000..9266241
--- /dev/null
+++ b/src/store/actions.ts
@@ -0,0 +1,58 @@
+import {MutationTypes} from "@/store/mutation-types";
+import {ActionContext, ActionTree} from "vuex";
+import {State} from "@/store/state";
+import {ActionTypes} from "@/store/action-types";
+import API from '@/api';
+import {Mutations} from "@/store/mutations";
+import {DynmapConfigurationResponse, DynmapUpdateResponse} from "@/dynmap";
+
+type AugmentedActionContext = {
+	commit<K extends keyof Mutations>(
+		key: K,
+		payload: Parameters<Mutations[K]>[1]
+		):ReturnType<Mutations[K]>;
+} & Omit<ActionContext<State, State>, "commit">
+
+export interface Actions {
+	[ActionTypes.LOAD_CONFIGURATION](
+		{commit}: AugmentedActionContext,
+	):Promise<DynmapConfigurationResponse>
+	[ActionTypes.GET_UPDATE](
+		{commit}: AugmentedActionContext,
+	):Promise<DynmapUpdateResponse>
+}
+
+export const actions: ActionTree<State, State> & Actions = {
+	[ActionTypes.LOAD_CONFIGURATION]({commit}) {
+		return API.getConfiguration().then(config => {
+			commit(MutationTypes.SET_CONFIGURATION, config.config);
+			commit(MutationTypes.SET_MESSAGES, config.messages);
+			commit(MutationTypes.SET_WORLDS, config.worlds);
+
+			if(config.config.defaultWorld && config.config.defaultMap) {
+				commit(MutationTypes.SET_CURRENT_MAP, {
+					world: config.config.defaultWorld,
+					map: config.config.defaultMap
+				});
+			}
+
+			return config;
+		});
+	},
+	[ActionTypes.GET_UPDATE]({commit, state}) {
+		if(!state.currentWorld) {
+			return Promise.reject("No current world");
+		}
+
+		return API.getUpdate(state.updateRequestId, state.currentWorld.name, state.updateTimestamp.getUTCMilliseconds()).then(update => {
+			commit(MutationTypes.SET_PLAYERS, update.players);
+			commit(MutationTypes.SET_TIME_OF_DAY, update.timeOfDay);
+			commit(MutationTypes.SET_RAINING, update.raining);
+			commit(MutationTypes.SET_THUNDERING, update.thundering);
+			commit(MutationTypes.SET_UPDATE_TIMESTAMP, new Date(update.timestamp));
+			commit(MutationTypes.INCREMENT_REQUEST_ID, undefined);
+
+			return update;
+		});
+	}
+}
\ No newline at end of file
diff --git a/src/store/getters.ts b/src/store/getters.ts
new file mode 100644
index 0000000..3b12e55
--- /dev/null
+++ b/src/store/getters.ts
@@ -0,0 +1,10 @@
+import {GetterTree} from "vuex";
+import {State} from "@/store/state";
+
+export type Getters = {
+
+}
+
+export const getters: GetterTree<State, State> & Getters = {
+
+}
\ No newline at end of file
diff --git a/src/store/index.ts b/src/store/index.ts
index 091bdf5..42607c6 100644
--- a/src/store/index.ts
+++ b/src/store/index.ts
@@ -2,246 +2,13 @@ import {
 	createStore,
 	Store as VuexStore,
 	createLogger,
-	MutationTree,
-	ActionContext, ActionTree, GetterTree, CommitOptions, DispatchOptions,
+	CommitOptions, DispatchOptions,
 } from 'vuex';
-import API from './../api';
-import {
-	DynmapConfigurationResponse,
-	DynmapMap,
-	DynmapMessageConfig,
-	DynmapPlayer,
-	DynmapServerConfig,
-	DynmapUpdateResponse,
-	DynmapWorld
-} from "@/dynmap";
 
-// Mutations
-export enum MutationTypes {
-	SET_CONFIGURATION = 'setConfiguration',
-	SET_MESSAGES = 'setMessages',
-	SET_WORLDS = 'setWorlds',
-	ADD_WORLD = 'addWorld',
-	SET_TIME_OF_DAY = 'setTimeOfDay',
-	SET_RAINING = 'setRaining',
-	SET_THUNDERING = 'setThundering',
-	SET_UPDATE_TIMESTAMP = 'setUpdateTimestamp',
-	INCREMENT_REQUEST_ID = 'incrementRequestId',
-	SET_PLAYERS = 'setPlayers',
-	SET_CURRENT_MAP = 'setCurrentMap',
-}
-
-export enum ActionTypes {
-	LOAD_CONFIGRUATION = "loadConfiguration",
-	GET_UPDATE = "getUpdate",
-}
-
-export type CurrentMapPayload = {
-	world: string
-	map: string
-}
-
-export type Mutations<S = State> = {
-	[MutationTypes.SET_CONFIGURATION](state: S, config: DynmapServerConfig): void
-	[MutationTypes.SET_MESSAGES](state: S, messages: DynmapMessageConfig): void
-	[MutationTypes.SET_WORLDS](state: S, worlds: Array<DynmapWorld>): void
-	[MutationTypes.ADD_WORLD](state: S, world: DynmapWorld): void
-	[MutationTypes.SET_TIME_OF_DAY](state: S, time: number): void
-	[MutationTypes.SET_RAINING](state: S, raining: boolean): void
-	[MutationTypes.SET_THUNDERING](state: S, thundering: boolean): void
-	[MutationTypes.SET_UPDATE_TIMESTAMP](state: S, time: Date): void
-	[MutationTypes.INCREMENT_REQUEST_ID](state: S): void
-	[MutationTypes.SET_PLAYERS](state: S, players: Array<DynmapPlayer>): void
-	[MutationTypes.SET_CURRENT_MAP](state: S, payload: CurrentMapPayload): void
-}
-
-const mutations: MutationTree<State> & Mutations = {
-	[MutationTypes.SET_CONFIGURATION](state: State, config: DynmapServerConfig) {
-		state.configuration = Object.assign(state.configuration, config);
-	},
-	[MutationTypes.SET_MESSAGES](state: State, messages: DynmapMessageConfig) {
-		state.messages = Object.assign(state.messages, messages);
-	},
-
-	[MutationTypes.SET_WORLDS](state: State, worlds: Array<DynmapWorld>) {
-		state.worlds.clear();
-		state.maps.clear();
-
-		state.configuration.followMap = undefined;
-		state.configuration.followZoom = undefined;
-		state.configuration.defaultMap = undefined;
-		state.configuration.defaultWorld = undefined;
-
-		state.currentMap = undefined;
-		state.currentWorld = undefined;
-		state.following = undefined;
-
-		state.timeOfDay = 0;
-		state.raining = false;
-		state.thundering = false;
-
-		worlds.forEach(world => {
-			state.worlds.set(world.name, world);
-			world.maps.forEach(map => state.maps.set([world.name, map.name].join('_'), map));
-		});
-	},
-
-	[MutationTypes.ADD_WORLD](state: State, world: DynmapWorld) {
-		state.worlds.set(world.name, world);
-	},
-
-	[MutationTypes.SET_TIME_OF_DAY](state: State, time: number) {
-		if (time < 0 || time > 24000) {
-			throw new RangeError("Time must be between 0 and 24000");
-		}
-
-		state.timeOfDay = time;
-	},
-
-	[MutationTypes.SET_RAINING](state: State, raining: boolean) {
-		state.raining = raining;
-	},
-
-	[MutationTypes.SET_THUNDERING](state: State, thundering: boolean) {
-		state.thundering = thundering;
-	},
-
-	[MutationTypes.SET_UPDATE_TIMESTAMP](state: State, timestamp: Date) {
-		state.updateTimestamp = timestamp;
-	},
-
-	[MutationTypes.INCREMENT_REQUEST_ID](state: State) {
-		state.updateRequestId++;
-	},
-
-	[MutationTypes.SET_PLAYERS](state: State, players: Array<DynmapPlayer>) {
-		const existingPlayers: Set<string> = new Set();
-
-		players.forEach(player => {
-			existingPlayers.add(player.account);
-
-			if (state.players.has(player.account)) {
-				const existing = state.players.get(player.account);
-
-				existing!.health = player.health;
-				existing!.armor = player.armor;
-				existing!.location = player.location;
-				existing!.name = player.name;
-				existing!.sort = player.sort;
-			} else {
-				state.players.set(player.account, {
-					account: player.account,
-					health: player.health,
-					armor: player.armor,
-					location: player.location,
-					name: player.name,
-					sort: player.sort,
-				});
-			}
-		});
-
-		for (const key of state.players.keys()) {
-			if (!existingPlayers.has(key)) {
-				state.players.delete(key);
-			}
-		}
-	},
-
-	[MutationTypes.SET_CURRENT_MAP](state: State, {world, map}) {
-		const mapName = [world, map].join('_');
-
-		if(!state.worlds.has(world)) {
-			throw new RangeError(`Unknown world ${world}`);
-		}
-
-		if(!state.maps.has(mapName)) {
-			throw new RangeError(`Unknown map ${map}`);
-		}
-
-		state.currentWorld = state.worlds.get(world);
-		state.currentMap = state.maps.get(mapName);
-	},
-}
-
-type AugmentedActionContext = {
-	commit<K extends keyof Mutations>(
-		key: K,
-		payload: Parameters<Mutations[K]>[1]
-		):ReturnType<Mutations[K]>;
-} & Omit<ActionContext<State, State>, "commit">
-
-export interface Actions {
-	[ActionTypes.LOAD_CONFIGRUATION](
-		{commit}: AugmentedActionContext,
-	):Promise<DynmapConfigurationResponse>
-	[ActionTypes.GET_UPDATE](
-		{commit}: AugmentedActionContext,
-	):Promise<DynmapUpdateResponse>
-}
-
-export const actions: ActionTree<State, State> & Actions = {
-	[ActionTypes.LOAD_CONFIGRUATION]({commit}) {
-		return API.getConfiguration().then(config => {
-			commit(MutationTypes.SET_CONFIGURATION, config.config);
-			commit(MutationTypes.SET_MESSAGES, config.messages);
-			commit(MutationTypes.SET_WORLDS, config.worlds);
-
-			if(config.config.defaultWorld && config.config.defaultMap) {
-				commit(MutationTypes.SET_CURRENT_MAP, {
-					world: config.config.defaultWorld,
-					map: config.config.defaultMap
-				});
-			}
-
-			return config;
-		});
-	},
-	[ActionTypes.GET_UPDATE]({commit}) {
-		if(!state.currentWorld) {
-			return Promise.reject("No current world");
-		}
-
-		return API.getUpdate(state.updateRequestId, state.currentWorld.name, state.updateTimestamp.getUTCMilliseconds()).then(update => {
-			commit(MutationTypes.SET_PLAYERS, update.players);
-			commit(MutationTypes.SET_TIME_OF_DAY, update.timeOfDay);
-			commit(MutationTypes.SET_RAINING, update.raining);
-			commit(MutationTypes.SET_THUNDERING, update.thundering);
-			commit(MutationTypes.SET_UPDATE_TIMESTAMP, new Date(update.timestamp));
-			commit(MutationTypes.INCREMENT_REQUEST_ID, undefined);
-
-			return update;
-		});
-	}
-}
-
-export type State = {
-	configuration: DynmapServerConfig;
-	messages: DynmapMessageConfig;
-	worlds: Map<string, DynmapWorld>;
-	maps: Map<string, DynmapMap>;
-	players: Map<string, DynmapPlayer>;
-
-	following?: DynmapPlayer;
-
-	// currentServer?: string;
-	currentWorld?: DynmapWorld;
-	currentMap?: DynmapMap;
-
-	raining: boolean;
-	thundering: boolean;
-	timeOfDay: number;
-
-	updateRequestId: number;
-	updateTimestamp: Date;
-}
-
-export type Getters = {
-
-}
-
-export const getters: GetterTree<State, State> & Getters = {
-
-}
+import {getters, Getters} from "@/store/getters";
+import {mutations, Mutations} from "@/store/mutations";
+import {state, State} from "@/store/state";
+import {actions, Actions} from "@/store/actions";
 
 export type Store = Omit<
 	VuexStore<State>,
@@ -264,60 +31,13 @@ export type Store = Omit<
 	):ReturnType<Actions[K]>;
 };
 
-const state: State = {
-	configuration: {
-		version: '',
-		allowChat: false,
-		chatRequiresLogin: false,
-		chatInterval: 5000,
-		defaultMap: '',
-		defaultWorld: '',
-		defaultZoom: 0,
-		followMap: '',
-		followZoom: 0,
-		updateInterval: 3000,
-		showLayerControl: true,
-		title: '',
-		loginEnabled: false,
-		loginRequired: false,
-		maxPlayers: 0,
-		hash: 0,
-	},
-	messages: {
-		chatNotAllowed: '',
-		chatRequiresLogin: '',
-		chatCooldown: '',
-		mapTypes: '',
-		players: '',
-		playerJoin: '',
-		playerQuit: '',
-		anonymousJoin: '',
-		anonymousQuit: '',
-	},
-	worlds: new Map(),
-	maps: new Map(),
-	players: new Map(),
-
-	raining: false,
-	thundering: false,
-	timeOfDay: 0,
-
-	following: undefined,
-
-	// currentServer: undefined,
-	currentWorld: undefined,
-	currentMap: undefined,
-
-	updateRequestId: 0,
-	updateTimestamp: new Date(),
-};
 
 export const store = createStore({
 	state,
 	mutations,
 	getters,
 	actions,
-	// plugins: [createLogger()],
+	plugins: [createLogger()],
 });
 
 // define your own `useStore` composition function
diff --git a/src/store/mutation-types.ts b/src/store/mutation-types.ts
new file mode 100644
index 0000000..cef44a0
--- /dev/null
+++ b/src/store/mutation-types.ts
@@ -0,0 +1,13 @@
+export enum MutationTypes {
+	SET_CONFIGURATION = 'setConfiguration',
+	SET_MESSAGES = 'setMessages',
+	SET_WORLDS = 'setWorlds',
+	ADD_WORLD = 'addWorld',
+	SET_TIME_OF_DAY = 'setTimeOfDay',
+	SET_RAINING = 'setRaining',
+	SET_THUNDERING = 'setThundering',
+	SET_UPDATE_TIMESTAMP = 'setUpdateTimestamp',
+	INCREMENT_REQUEST_ID = 'incrementRequestId',
+	SET_PLAYERS = 'setPlayers',
+	SET_CURRENT_MAP = 'setCurrentMap',
+}
\ No newline at end of file
diff --git a/src/store/mutations.ts b/src/store/mutations.ts
new file mode 100644
index 0000000..f4e92f5
--- /dev/null
+++ b/src/store/mutations.ts
@@ -0,0 +1,131 @@
+import {MutationTree} from "vuex";
+import {MutationTypes} from "@/store/mutation-types";
+import {State} from "@/store/state";
+import {DynmapMessageConfig, DynmapPlayer, DynmapServerConfig, DynmapWorld} from "@/dynmap";
+
+export type CurrentMapPayload = {
+	world: string
+	map: string
+}
+
+export type Mutations<S = State> = {
+	[MutationTypes.SET_CONFIGURATION](state: S, config: DynmapServerConfig): void
+	[MutationTypes.SET_MESSAGES](state: S, messages: DynmapMessageConfig): void
+	[MutationTypes.SET_WORLDS](state: S, worlds: Array<DynmapWorld>): void
+	[MutationTypes.ADD_WORLD](state: S, world: DynmapWorld): void
+	[MutationTypes.SET_TIME_OF_DAY](state: S, time: number): void
+	[MutationTypes.SET_RAINING](state: S, raining: boolean): void
+	[MutationTypes.SET_THUNDERING](state: S, thundering: boolean): void
+	[MutationTypes.SET_UPDATE_TIMESTAMP](state: S, time: Date): void
+	[MutationTypes.INCREMENT_REQUEST_ID](state: S): void
+	[MutationTypes.SET_PLAYERS](state: S, players: Array<DynmapPlayer>): void
+	[MutationTypes.SET_CURRENT_MAP](state: S, payload: CurrentMapPayload): void
+}
+
+export const mutations: MutationTree<State> & Mutations = {
+	[MutationTypes.SET_CONFIGURATION](state: State, config: DynmapServerConfig) {
+		state.configuration = Object.assign(state.configuration, config);
+	},
+	[MutationTypes.SET_MESSAGES](state: State, messages: DynmapMessageConfig) {
+		state.messages = Object.assign(state.messages, messages);
+	},
+
+	[MutationTypes.SET_WORLDS](state: State, worlds: Array<DynmapWorld>) {
+		state.worlds.clear();
+		state.maps.clear();
+
+		state.configuration.followMap = undefined;
+		state.configuration.followZoom = undefined;
+		state.configuration.defaultMap = undefined;
+		state.configuration.defaultWorld = undefined;
+
+		state.currentMap = undefined;
+		state.currentWorld = undefined;
+		state.following = undefined;
+
+		state.timeOfDay = 0;
+		state.raining = false;
+		state.thundering = false;
+
+		worlds.forEach(world => {
+			state.worlds.set(world.name, world);
+			world.maps.forEach(map => state.maps.set([world.name, map.name].join('_'), map));
+		});
+	},
+
+	[MutationTypes.ADD_WORLD](state: State, world: DynmapWorld) {
+		state.worlds.set(world.name, world);
+	},
+
+	[MutationTypes.SET_TIME_OF_DAY](state: State, time: number) {
+		if (time < 0 || time > 24000) {
+			throw new RangeError("Time must be between 0 and 24000");
+		}
+
+		state.timeOfDay = time;
+	},
+
+	[MutationTypes.SET_RAINING](state: State, raining: boolean) {
+		state.raining = raining;
+	},
+
+	[MutationTypes.SET_THUNDERING](state: State, thundering: boolean) {
+		state.thundering = thundering;
+	},
+
+	[MutationTypes.SET_UPDATE_TIMESTAMP](state: State, timestamp: Date) {
+		state.updateTimestamp = timestamp;
+	},
+
+	[MutationTypes.INCREMENT_REQUEST_ID](state: State) {
+		state.updateRequestId++;
+	},
+
+	[MutationTypes.SET_PLAYERS](state: State, players: Array<DynmapPlayer>) {
+		const existingPlayers: Set<string> = new Set();
+
+		players.forEach(player => {
+			existingPlayers.add(player.account);
+
+			if (state.players.has(player.account)) {
+				const existing = state.players.get(player.account);
+
+				existing!.health = player.health;
+				existing!.armor = player.armor;
+				existing!.location = player.location;
+				existing!.name = player.name;
+				existing!.sort = player.sort;
+			} else {
+				state.players.set(player.account, {
+					account: player.account,
+					health: player.health,
+					armor: player.armor,
+					location: player.location,
+					name: player.name,
+					sort: player.sort,
+				});
+			}
+		});
+
+		for (const key of state.players.keys()) {
+			if (!existingPlayers.has(key)) {
+				state.players.delete(key);
+			}
+		}
+	},
+
+	[MutationTypes.SET_CURRENT_MAP](state: State, {world, map}) {
+		const mapName = [world, map].join('_');
+
+		if(!state.worlds.has(world)) {
+			throw new RangeError(`Unknown world ${world}`);
+		}
+
+		if(!state.maps.has(mapName)) {
+			throw new RangeError(`Unknown map ${map}`);
+		}
+
+		state.currentWorld = state.worlds.get(world);
+		state.currentMap = state.maps.get(mapName);
+	},
+}
\ No newline at end of file
diff --git a/src/store/state.ts b/src/store/state.ts
new file mode 100644
index 0000000..731b20d
--- /dev/null
+++ b/src/store/state.ts
@@ -0,0 +1,70 @@
+import {DynmapMap, DynmapMessageConfig, DynmapPlayer, DynmapServerConfig, DynmapWorld} from "@/dynmap";
+
+export type State = {
+	configuration: DynmapServerConfig;
+	messages: DynmapMessageConfig;
+	worlds: Map<string, DynmapWorld>;
+	maps: Map<string, DynmapMap>;
+	players: Map<string, DynmapPlayer>;
+
+	following?: DynmapPlayer;
+
+	// currentServer?: string;
+	currentWorld?: DynmapWorld;
+	currentMap?: DynmapMap;
+
+	raining: boolean;
+	thundering: boolean;
+	timeOfDay: number;
+
+	updateRequestId: number;
+	updateTimestamp: Date;
+}
+
+export const state: State = {
+	configuration: {
+		version: '',
+		allowChat: false,
+		chatRequiresLogin: false,
+		chatInterval: 5000,
+		defaultMap: '',
+		defaultWorld: '',
+		defaultZoom: 0,
+		followMap: '',
+		followZoom: 0,
+		updateInterval: 3000,
+		showLayerControl: true,
+		title: '',
+		loginEnabled: false,
+		loginRequired: false,
+		maxPlayers: 0,
+		hash: 0,
+	},
+	messages: {
+		chatNotAllowed: '',
+		chatRequiresLogin: '',
+		chatCooldown: '',
+		mapTypes: '',
+		players: '',
+		playerJoin: '',
+		playerQuit: '',
+		anonymousJoin: '',
+		anonymousQuit: '',
+	},
+	worlds: new Map(),
+	maps: new Map(),
+	players: new Map(),
+
+	raining: false,
+	thundering: false,
+	timeOfDay: 0,
+
+	following: undefined,
+
+	// currentServer: undefined,
+	currentWorld: undefined,
+	currentMap: undefined,
+
+	updateRequestId: 0,
+	updateTimestamp: new Date(),
+};