diff --git a/.gitignore b/.gitignore
index 1820c9ec0..e68cdd744 100644
--- a/.gitignore
+++ b/.gitignore
@@ -8,6 +8,7 @@
 /release
 api.js
 epg-worker.js
+ipc-commands.js
 main.js
 menu.js
 src/**/*.js
diff --git a/api.ts b/api.ts
index e53e388b3..cc1262032 100644
--- a/api.ts
+++ b/api.ts
@@ -11,7 +11,7 @@ import {
     EPG_FETCH_DONE,
     EPG_GET_PROGRAM,
     EPG_GET_PROGRAM_DONE,
-} from './src/app/shared/ipc-commands';
+} from './ipc-commands';
 
 const fs = require('fs');
 const userData = app.getPath('userData');
diff --git a/epg-worker.ts b/epg-worker.ts
index cb4c25c5c..c08558394 100644
--- a/epg-worker.ts
+++ b/epg-worker.ts
@@ -11,7 +11,7 @@ import {
     EPG_FETCH_DONE,
     EPG_GET_PROGRAM,
     EPG_GET_PROGRAM_DONE,
-} from './src/app/shared/ipc-commands';
+} from './ipc-commands';
 
 // EPG data store
 let EPG_DATA: { channels: EpgChannel[]; programs: EpgProgram[] };
diff --git a/src/app/shared/ipc-commands.ts b/ipc-commands.ts
similarity index 100%
rename from src/app/shared/ipc-commands.ts
rename to ipc-commands.ts
diff --git a/main.ts b/main.ts
index 6a6c28d4c..afa2f85b2 100644
--- a/main.ts
+++ b/main.ts
@@ -74,7 +74,7 @@ function createEpgWorkerWindow() {
         window.loadFile('epg-worker.html');
         window.webContents.openDevTools();
     } else {
-        window.loadFile('dist/epg-worker.html');
+        window.loadFile('epg-worker.html');
     }
 
     window.once('ready-to-show', () => {
diff --git a/src/app/app.component.ts b/src/app/app.component.ts
index e174ae347..96fc74a61 100644
--- a/src/app/app.component.ts
+++ b/src/app/app.component.ts
@@ -7,7 +7,7 @@ import { MatSnackBar } from '@angular/material/snack-bar';
 import { ChannelStore } from './state';
 import { StorageMap } from '@ngx-pwa/local-storage';
 import { Settings } from './settings/settings.interface';
-import { EPG_ERROR, EPG_FETCH, EPG_FETCH_DONE } from './shared/ipc-commands';
+import { EPG_ERROR, EPG_FETCH, EPG_FETCH_DONE } from '../../ipc-commands';
 
 // create custom title bar
 new Titlebar({
diff --git a/src/app/player/components/epg-list/epg-list.component.ts b/src/app/player/components/epg-list/epg-list.component.ts
index f5282266e..852bcc848 100644
--- a/src/app/player/components/epg-list/epg-list.component.ts
+++ b/src/app/player/components/epg-list/epg-list.component.ts
@@ -3,7 +3,7 @@ import { EpgChannel } from '../../models/epg-channel.model';
 import { EpgProgram } from '../../models/epg-program.model';
 import * as moment from 'moment';
 import { ElectronService } from '../../../services/electron.service';
-import { EPG_GET_PROGRAM_DONE } from '../../../shared/ipc-commands';
+import { EPG_GET_PROGRAM_DONE } from '../../../../../ipc-commands';
 import { ChannelQuery, ChannelStore } from '../../../state';
 import { Observable } from 'rxjs';
 import { map } from 'rxjs/operators';
diff --git a/src/app/settings/settings.component.ts b/src/app/settings/settings.component.ts
index 23e597274..e10e0ad6f 100644
--- a/src/app/settings/settings.component.ts
+++ b/src/app/settings/settings.component.ts
@@ -7,9 +7,9 @@ import { Observable, Subscription } from 'rxjs';
 import { Settings } from './settings.interface';
 import { HttpClient } from '@angular/common/http';
 import * as semver from 'semver';
-import { ElectronService } from 'app/services/electron.service';
-import { ChannelQuery } from 'app/state';
-import { EPG_FETCH } from 'app/shared/ipc-commands';
+import { ElectronService } from '../services/electron.service';
+import { ChannelQuery } from '../state';
+import { EPG_FETCH } from '../../../ipc-commands';
 
 @Component({
     selector: 'app-settings',
diff --git a/src/app/state/channel.store.ts b/src/app/state/channel.store.ts
index bf5814fe5..57559a365 100644
--- a/src/app/state/channel.store.ts
+++ b/src/app/state/channel.store.ts
@@ -1,6 +1,6 @@
 import { Injectable } from '@angular/core';
 import { EntityState, EntityStore, StoreConfig } from '@datorama/akita';
-import { EPG_GET_PROGRAM } from '../shared/ipc-commands';
+import { EPG_GET_PROGRAM } from '../../../ipc-commands';
 import { ElectronService } from '../services/electron.service';
 import { Channel } from './channel.model';
 import * as moment from 'moment';