diff --git a/webclient/src/api/AdminService.tsx b/webclient/src/api/AdminService.tsx
index b7fb9efa4..623ad546a 100644
--- a/webclient/src/api/AdminService.tsx
+++ b/webclient/src/api/AdminService.tsx
@@ -1,6 +1,6 @@
 import { AdminCommands } from 'websocket';
 
-export default class AdminService {
+export class AdminService {
   static adjustMod(userName: string, shouldBeMod?: boolean, shouldBeJudge?: boolean): void {
     AdminCommands.adjustMod(userName, shouldBeMod, shouldBeJudge);
   }
diff --git a/webclient/src/api/AuthenticationService.tsx b/webclient/src/api/AuthenticationService.tsx
index eb2215207..368390708 100644
--- a/webclient/src/api/AuthenticationService.tsx
+++ b/webclient/src/api/AuthenticationService.tsx
@@ -1,7 +1,7 @@
 import { StatusEnum, User, WebSocketConnectReason, WebSocketConnectOptions } from 'types';
 import { SessionCommands, webClient } from 'websocket';
 
-export default class AuthenticationService {
+export class AuthenticationService {
   static login(options: WebSocketConnectOptions): void {
     SessionCommands.connect(options, WebSocketConnectReason.LOGIN);
   }
diff --git a/webclient/src/api/ModeratorService.tsx b/webclient/src/api/ModeratorService.tsx
index 28668c2e5..e7c8822e8 100644
--- a/webclient/src/api/ModeratorService.tsx
+++ b/webclient/src/api/ModeratorService.tsx
@@ -1,7 +1,7 @@
 import { ModeratorCommands } from 'websocket';
 import { LogFilters } from 'types';
 
-export default class ModeratorService {
+export class ModeratorService {
   static banFromServer(minutes: number, userName?: string, address?: string, reason?: string,
     visibleReason?: string, clientid?: string, removeMessages?: number): void {
     ModeratorCommands.banFromServer(minutes, userName, address, reason, visibleReason, clientid, removeMessages);
diff --git a/webclient/src/api/RoomsService.tsx b/webclient/src/api/RoomsService.tsx
index 836c4464f..bfb63d92a 100644
--- a/webclient/src/api/RoomsService.tsx
+++ b/webclient/src/api/RoomsService.tsx
@@ -1,6 +1,6 @@
 import { RoomCommands, SessionCommands } from 'websocket';
 
-export default class RoomsService {
+export class RoomsService {
   static joinRoom(roomId: number): void {
     SessionCommands.joinRoom(roomId);
   }
diff --git a/webclient/src/api/RouterService.tsx b/webclient/src/api/RouterService.tsx
deleted file mode 100644
index 071c46581..000000000
--- a/webclient/src/api/RouterService.tsx
+++ /dev/null
@@ -1,7 +0,0 @@
-import { RouteEnum } from 'types';
-
-export class RouterService {
-  resolveUrl(path, params) {
-
-  }
-}
diff --git a/webclient/src/api/SessionService.tsx b/webclient/src/api/SessionService.tsx
index 1ecab0743..051954f93 100644
--- a/webclient/src/api/SessionService.tsx
+++ b/webclient/src/api/SessionService.tsx
@@ -2,7 +2,7 @@ import { SessionCommands } from 'websocket';
 import { common } from 'protobufjs';
 import IBytesValue = common.IBytesValue;
 
-export default class SessionService {
+export class SessionService {
   static addToBuddyList(userName: string) {
     SessionCommands.addToBuddyList(userName);
   }
diff --git a/webclient/src/api/index.ts b/webclient/src/api/index.ts
index aebb8f81a..c4f67092e 100644
--- a/webclient/src/api/index.ts
+++ b/webclient/src/api/index.ts
@@ -1,5 +1,5 @@
-export { default as AdminService } from './AdminService';
-export { default as AuthenticationService } from './AuthenticationService';
-export { default as ModeratorService } from './ModeratorService';
-export { default as RoomsService } from './RoomsService';
-export { default as SessionService } from './SessionService';
+export { AdminService } from './AdminService';
+export { AuthenticationService } from './AuthenticationService';
+export { ModeratorService } from './ModeratorService';
+export { RoomsService } from './RoomsService';
+export { SessionService } from './SessionService';
diff --git a/webclient/src/websocket/index.ts b/webclient/src/websocket/index.ts
index 7f9030b8b..b52c97168 100644
--- a/webclient/src/websocket/index.ts
+++ b/webclient/src/websocket/index.ts
@@ -1,2 +1,3 @@
-export { default as webClient } from './WebClient';
 export * from './commands';
+
+export { default as webClient } from './WebClient';