diff --git a/webclient/src/websocket/instanceService/AuthenticationService.tsx b/webclient/src/api/AuthenticationService.tsx
similarity index 100%
rename from webclient/src/websocket/instanceService/AuthenticationService.tsx
rename to webclient/src/api/AuthenticationService.tsx
diff --git a/webclient/src/websocket/instanceService/ModeratorService.tsx b/webclient/src/api/ModeratorService.tsx
similarity index 77%
rename from webclient/src/websocket/instanceService/ModeratorService.tsx
rename to webclient/src/api/ModeratorService.tsx
index 046de8c43..e19f25e95 100644
--- a/webclient/src/websocket/instanceService/ModeratorService.tsx
+++ b/webclient/src/api/ModeratorService.tsx
@@ -1,4 +1,4 @@
-import { webClient } from "..";
+import { webClient } from "websocket";
 
 export default class ModeratorService {
   static viewLogHistory(filters) {
diff --git a/webclient/src/websocket/instanceService/RoomsService.tsx b/webclient/src/api/RoomsService.tsx
similarity index 84%
rename from webclient/src/websocket/instanceService/RoomsService.tsx
rename to webclient/src/api/RoomsService.tsx
index db8831122..41554f0e7 100644
--- a/webclient/src/websocket/instanceService/RoomsService.tsx
+++ b/webclient/src/api/RoomsService.tsx
@@ -1,4 +1,4 @@
-import { webClient } from "..";
+import { webClient } from "websocket";
 
 export default class RoomsService {
   static joinRoom(roomId) {
diff --git a/webclient/src/websocket/instanceService/RouterService.tsx b/webclient/src/api/RouterService.tsx
similarity index 61%
rename from webclient/src/websocket/instanceService/RouterService.tsx
rename to webclient/src/api/RouterService.tsx
index aac363390..4f4ca7762 100644
--- a/webclient/src/websocket/instanceService/RouterService.tsx
+++ b/webclient/src/api/RouterService.tsx
@@ -1,4 +1,4 @@
-import { RouteEnum } from "../../types";
+import { RouteEnum } from "types";
 
 export class RouterService {
   resolveUrl(path, params) {
diff --git a/webclient/src/websocket/instanceService/SessionService.tsx b/webclient/src/api/SessionService.tsx
similarity index 91%
rename from webclient/src/websocket/instanceService/SessionService.tsx
rename to webclient/src/api/SessionService.tsx
index aef2758cf..e7af9615f 100644
--- a/webclient/src/websocket/instanceService/SessionService.tsx
+++ b/webclient/src/api/SessionService.tsx
@@ -1,4 +1,4 @@
-import { webClient } from "..";
+import { webClient } from "websocket";
 
 export default class SessionService {
   static addToBuddyList(userName) {
diff --git a/webclient/src/websocket/instanceService/index.ts b/webclient/src/api/index.ts
similarity index 100%
rename from webclient/src/websocket/instanceService/index.ts
rename to webclient/src/api/index.ts
diff --git a/webclient/src/components/Guard/AuthGuard.tsx b/webclient/src/components/Guard/AuthGuard.tsx
index 07198a5b1..c65b663e8 100644
--- a/webclient/src/components/Guard/AuthGuard.tsx
+++ b/webclient/src/components/Guard/AuthGuard.tsx
@@ -5,7 +5,7 @@ import { Redirect } from "react-router-dom";
 import { ServerSelectors } from "store";
 import { RouteEnum } from "types";
 
-import { AuthenticationService } from "websocket";
+import { AuthenticationService } from "api";
 
 class AuthGuard extends Component<AuthGuardProps> {
   render() {
diff --git a/webclient/src/components/Guard/ModGuard.tsx b/webclient/src/components/Guard/ModGuard.tsx
index e1ea5e3df..5586b7b84 100644
--- a/webclient/src/components/Guard/ModGuard.tsx
+++ b/webclient/src/components/Guard/ModGuard.tsx
@@ -5,7 +5,7 @@ import { Redirect } from "react-router-dom";
 import { ServerSelectors } from "store";
 import { User } from "types";
 
-import { AuthenticationService } from "websocket";
+import { AuthenticationService } from "api";
 import { RouteEnum } from "types";
 
 class ModGuard extends Component<ModGuardProps> {
diff --git a/webclient/src/components/Header/Header.tsx b/webclient/src/components/Header/Header.tsx
index 5bede691b..735b89cc1 100644
--- a/webclient/src/components/Header/Header.tsx
+++ b/webclient/src/components/Header/Header.tsx
@@ -6,11 +6,9 @@ import Chip from "@material-ui/core/Chip";
 import Toolbar from "@material-ui/core/Toolbar";
 import * as _ from "lodash";
 
+import { AuthenticationService } from "api";
 import {  RoomsSelectors, ServerSelectors } from "store";
-import { Room, User } from "types";
-
-import { AuthenticationService } from "../../websocket";
-import { RouteEnum } from "../../types";
+import { Room, RouteEnum, User } from "types";
 
 import "./Header.css";
 import logo from "./logo.png";
diff --git a/webclient/src/components/Logs/Logs.tsx b/webclient/src/components/Logs/Logs.tsx
index 7aa35ce48..ce7ffe0e1 100644
--- a/webclient/src/components/Logs/Logs.tsx
+++ b/webclient/src/components/Logs/Logs.tsx
@@ -6,7 +6,7 @@ import * as _ from "lodash";
 
 import { ServerDispatch, ServerSelectors, ServerStateLogs } from "store";
 
-import { ModeratorService } from "websocket";
+import { ModeratorService } from "api";
 
 import { AuthGuard, ModGuard} from "components";
 import LogResults from "./LogResults";
diff --git a/webclient/src/components/Room/Room.tsx b/webclient/src/components/Room/Room.tsx
index 074fb3fb2..bd6ea646b 100644
--- a/webclient/src/components/Room/Room.tsx
+++ b/webclient/src/components/Room/Room.tsx
@@ -5,9 +5,9 @@ import { withRouter /*, RouteComponentProps */ } from "react-router-dom";
 import ListItem from "@material-ui/core/ListItem";
 import Paper from "@material-ui/core/Paper";
 
-import { RoomsStateMessages, RoomsStateRooms, RoomsSelectors } from "store";
-import { RoomsService } from "websocket";
+import { RoomsService } from "api";
 import { ScrollToBottomOnChanges, ThreePaneLayout, UserDisplay, VirtualList, AuthGuard} from "components";
+import { RoomsStateMessages, RoomsStateRooms, RoomsSelectors } from "store";
 
 
 
diff --git a/webclient/src/components/Server/Rooms.tsx b/webclient/src/components/Server/Rooms.tsx
index 6f839d73b..22a98fd93 100644
--- a/webclient/src/components/Server/Rooms.tsx
+++ b/webclient/src/components/Server/Rooms.tsx
@@ -11,7 +11,7 @@ import TableHead from "@material-ui/core/TableHead";
 import TableRow from "@material-ui/core/TableRow";
 
 
-import { RoomsService } from "websocket";
+import { RoomsService } from "api";
 import { RouteEnum } from "types";
 
 import "./Rooms.css";
diff --git a/webclient/src/components/Server/Server.tsx b/webclient/src/components/Server/Server.tsx
index 7516c7865..0c98671c7 100644
--- a/webclient/src/components/Server/Server.tsx
+++ b/webclient/src/components/Server/Server.tsx
@@ -9,7 +9,7 @@ import Paper from "@material-ui/core/Paper";
 
 import { RoomsSelectors, ServerSelectors } from "store";
 
-import { AuthenticationService } from "websocket";
+import { AuthenticationService } from "api";
 
 import { ThreePaneLayout, UserDisplay, VirtualList } from "components";
 import { ConnectForm, RegisterForm } from "forms";
diff --git a/webclient/src/components/UserDisplay/UserDisplay.tsx b/webclient/src/components/UserDisplay/UserDisplay.tsx
index 5d44bc16a..121429867 100644
--- a/webclient/src/components/UserDisplay/UserDisplay.tsx
+++ b/webclient/src/components/UserDisplay/UserDisplay.tsx
@@ -6,12 +6,9 @@ import { NavLink, generatePath } from "react-router-dom";
 import Menu from "@material-ui/core/Menu";
 import MenuItem from "@material-ui/core/MenuItem";
 
-import { SessionService } from "../../websocket";
-import { ServerSelectors } from "../../store";
-
-import { RouteEnum } from "../../types";
-
-import { User } from "types";
+import { SessionService } from "api";
+import { ServerSelectors } from "store";
+import { RouteEnum, User } from "types";
 
 import "./UserDisplay.css";
 
@@ -93,8 +90,7 @@ class UserDisplay extends Component<UserDisplayProps, UserDisplayState> {
     const isABuddy = this.isABuddy();
     const isIgnored = this.isIgnored();
 
-
-    console.log('user', name, !!isABuddy, !!isIgnored);
+    // console.log('user', name, !!isABuddy, !!isIgnored);
 
     return (
       <div className="user-display">
diff --git a/webclient/src/containers/Account/Account.tsx b/webclient/src/containers/Account/Account.tsx
index 45fd496bf..8678b3056 100644
--- a/webclient/src/containers/Account/Account.tsx
+++ b/webclient/src/containers/Account/Account.tsx
@@ -7,7 +7,7 @@ import ListItem from "@material-ui/core/ListItem";
 import Paper from "@material-ui/core/Paper";
 
 import { UserDisplay, VirtualList, AuthGuard } from "components";
-import { AuthenticationService, SessionService } from "websocket";
+import { AuthenticationService, SessionService } from "api";
 import { ServerSelectors } from "store";
 import { User } from 'types';
 
diff --git a/webclient/src/websocket/index.ts b/webclient/src/websocket/index.ts
index 505dd6313..24989e648 100644
--- a/webclient/src/websocket/index.ts
+++ b/webclient/src/websocket/index.ts
@@ -3,9 +3,4 @@ export { default as ProtoFiles } from './ProtoFiles';
 
 
 // Export common used services
-
-export { NormalizeService, RoomService} from "./services";
-
-
-// Note: this has to come after webClient
-export { AuthenticationService, ModeratorService, RoomsService, SessionService } from "./instanceService";
\ No newline at end of file
+export { NormalizeService, RoomService} from "./services";
\ No newline at end of file