diff --git a/src/electron/app.js b/src/electron/app.js
new file mode 100644
index 0000000..cab751d
--- /dev/null
+++ b/src/electron/app.js
@@ -0,0 +1,67 @@
+const {app, BrowserWindow} = require('electron');
+const log = require('electron-log');
+const path = require('path');
+const url = require('url');
+
+log.transports.file.level = false;
+log.transports.console.level = 'info';
+
+// Keep a global reference of the window object, if you don't, the window will
+// be closed automatically when the JavaScript object is garbage collected.
+let mainWindow;
+
+const createWindow = () => {
+	// Create the browser window.
+	mainWindow = new BrowserWindow({
+		webPreferences: {
+			contextIsolation: true,
+			nodeIntegration: false,
+		},
+	});
+
+	// load the index.html of the app.
+	const startUrl = process.env.ELECTRON_START_URL || url.format({
+		pathname: path.join(__dirname, '/../../build/index.html'),
+		protocol: 'file:',
+		slashes: true,
+	});
+	mainWindow.loadURL(startUrl);
+	// Open the DevTools.
+	mainWindow.webContents.openDevTools({
+		mode: 'bottom',
+	});
+
+	// Emitted when the window is closed.
+	mainWindow.on('closed', () => {
+		// Dereference the window object, usually you would store windows
+		// in an array if your app supports multi windows, this is the time
+		// when you should delete the corresponding element.
+		mainWindow = null;
+	});
+};
+
+// This method will be called when Electron has finished
+// initialization and is ready to create browser windows.
+// Some APIs can only be used after this event occurs.
+app.on('ready', createWindow);
+
+app.on('browser-window-created', () => {
+	log.info('New browser window created');
+});
+
+// Quit when all windows are closed.
+app.on('window-all-closed', () => {
+	// On OS X it is common for applications and their menu bar
+	// to stay active until the user quits explicitly with Cmd + Q
+	if (process.platform !== 'darwin') {
+		app.quit();
+	}
+});
+
+app.on('activate', () => {
+	// On OS X it's common to re-create a window in the app when the
+	// dock icon is clicked and there are no other windows open.
+	if (mainWindow === null) {
+		createWindow();
+	}
+});
diff --git a/src/electron/exif-helpers.js b/src/electron/exif-helpers.js
new file mode 100644
index 0000000..5132c9c
--- /dev/null
+++ b/src/electron/exif-helpers.js
@@ -0,0 +1,16 @@
+const {ExifTool} = require('exiftool-vendored');
+const exiftool = new ExifTool();
+
+/**
+ * Get the EXIF data from the specified image path
+ *
+ * @param {string} imgPath
+ * @return {Promise<Tags>}
+ */
+function getExifTags (imgPath) {
+	return exiftool.read(imgPath);
+}
+
+module.exports = {
+	getExifTags,
+};
diff --git a/src/electron/starter.js b/src/electron/starter.js
index b539951..db67dbc 100644
--- a/src/electron/starter.js
+++ b/src/electron/starter.js
@@ -1,89 +1,8 @@
-const {app, BrowserWindow} = require('electron');
-const log = require('electron-log');
-
-log.transports.file.level = false;
-log.transports.console.level = 'info';
-
-const path = require('path');
-const url = require('url');
-
-// eslint-disable-next-line
-const WebSocket = require('ws');
-
 // eslint-disable-next-line
 global.eval = () => {};
 
-// Keep a global reference of the window object, if you don't, the window will
-// be closed automatically when the JavaScript object is garbage collected.
-let mainWindow;
+// Do app initialization and event handling
+require('./app');
 
-const createWindow = () => {
-	// Create the browser window.
-	mainWindow = new BrowserWindow({
-		webPreferences: {
-			contextIsolation: true,
-			nodeIntegration: false,
-		},
-	});
-
-	// load the index.html of the app.
-	const startUrl = process.env.ELECTRON_START_URL || url.format({
-		pathname: path.join(__dirname, '/../../build/index.html'),
-		protocol: 'file:',
-		slashes: true,
-	});
-	mainWindow.loadURL(startUrl);
-	// Open the DevTools.
-	mainWindow.webContents.openDevTools({
-		mode: 'bottom',
-	});
-
-	// Emitted when the window is closed.
-	mainWindow.on('closed', () => {
-		// Dereference the window object, usually you would store windows
-		// in an array if your app supports multi windows, this is the time
-		// when you should delete the corresponding element.
-		mainWindow = null;
-	});
-};
-
-// This method will be called when Electron has finished
-// initialization and is ready to create browser windows.
-// Some APIs can only be used after this event occurs.
-app.on('ready', createWindow);
-
-app.on('browser-window-created', () => {
-	log.info('New browser window created');
-});
-
-// Quit when all windows are closed.
-app.on('window-all-closed', () => {
-	// On OS X it is common for applications and their menu bar
-	// to stay active until the user quits explicitly with Cmd + Q
-	if (process.platform !== 'darwin') {
-		app.quit();
-	}
-});
-
-app.on('activate', () => {
-	// On OS X it's common to re-create a window in the app when the
-	// dock icon is clicked and there are no other windows open.
-	if (mainWindow === null) {
-		createWindow();
-	}
-});
-
-const wss = new WebSocket.Server({
-	perMessageDeflate: false,
-	port: 65432,
-});
-wss.broadcast = (data) => {
-	wss.clients.forEach(client => {
-		if (client.readyState === WebSocket.OPEN) {
-			client.send(data);
-		}
-	});
-};
-// In this file you can include the rest of your app's specific main process
-// code. You can also put them in separate files and require them here.
-require('./websocket-events')(wss);
+// Initialize websockets
+require('./websocket-events');
diff --git a/src/electron/websocket-events.js b/src/electron/websocket-events.js
index 1329a9d..4068bc4 100644
--- a/src/electron/websocket-events.js
+++ b/src/electron/websocket-events.js
@@ -1,33 +1,38 @@
+const {getExifTags} = require('./exif-helpers');
 /**
  * Websocket event handlers
  */
-const {ExifTool} = require('exiftool-vendored');
 const {JSONMessage} = require('../helpers/web-socket');
+// eslint-disable-next-line
+const WebSocket = require('ws');
 
-const exiftool = new ExifTool();
+const wss = new WebSocket.Server({
+	perMessageDeflate: false,
+	port: 65432,
+});
 
-module.exports = (wss) => {
-	wss.on('connection', ws => {
-		ws.send(JSONMessage('server-log', 'Connected to client!'));
-		ws.on('message', (...args) => {
-			const [type, message] = JSON.parse(args);
-			switch (type) {
-				case 'dropped-files':
-					const filemap = message.map(async file => {
-						const tags = await getExifTags(file);
-						// console.info('Parsed tags', JSON.stringify(tags));
-						return JSON.parse(JSON.stringify(tags));
-					});
-					wss.broadcast(JSONMessage('parsed-exif-tags', filemap));
-					break;
-
-				default:
-					return ws.send(JSONMessage('server-log', [type, message]));
-			}
-		});
+wss.broadcast = (data) => {
+	wss.clients.forEach(client => {
+		if (client.readyState === WebSocket.OPEN) {
+			client.send(data);
+		}
 	});
 };
 
-async function getExifTags (imgPath) {
-	await exiftool.read(imgPath);
-}
+wss.on('connection', ws => {
+	ws.send(JSONMessage('server-log', 'Connected to client!'));
+	ws.on('message', async (...args) => {
+		const [type, message] = JSON.parse(args);
+		switch (type) {
+			case 'dropped-files':
+				const filemap = await Promise.all(
+					message.map(file => getExifTags(file))
+				);
+				wss.broadcast(JSONMessage('parsed-exif-tags', await filemap));
+				break;
+
+			default:
+				return ws.send(JSONMessage('server-log', [type, message]));
+		}
+	});
+});