diff --git a/client/containers.ts b/client/containers.ts
index d93931b..bdfa13b 100644
--- a/client/containers.ts
+++ b/client/containers.ts
@@ -1,5 +1,5 @@
-import { ContainerVisibility, IContainer, IFireGemsStack, IInteractibleContainer, IMarket, IMarketStack, IPlayableContainer, IPlayerBoard, IPlayerDiscard, IPlayerHand, IPlayerStack } from "../generic/containers.js"
-import { IGameObject, ICard, IPlayer, IGame } from "../generic/index.js"
+import type { IContainer, IFireGemsStack, IInteractibleContainer, IMarket, IMarketStack, IPlayableContainer, IPlayerBoard, IPlayerDiscard, IPlayerHand, IPlayerStack } from "../generic/containers.js"
+import type { ICard } from "../generic/index.js"
 
 export interface ICContainer<T> extends IContainer<T> {
     onCardsAppend: (cards: Array<ICard>) => void
diff --git a/client/index.ts b/client/index.ts
index 5a02ea8..3a3800b 100644
--- a/client/index.ts
+++ b/client/index.ts
@@ -1,6 +1,5 @@
-import { IFireGemsStack, IMarket, IMarketStack, IPlayerBoard, IPlayerDiscard, IPlayerHand } from "../generic/containers.js"
-import { ICard, IEffect, IGame, IGameObject, ILobby, IPlayer, ITeam, ITurn, IUser } from "../generic/index.js"
-import { ISLobby } from "../server/index.js"
+import type { ICard, IEffect, IGame, ILobby, IPlayer, ITeam, ITurn, IUser } from "../generic/index.js"
+import type { ISLobby } from "../server/index.js"
 
 export interface ICEffect extends IEffect {
 
diff --git a/generic/containers.ts b/generic/containers.ts
index c4e1926..b9b8326 100644
--- a/generic/containers.ts
+++ b/generic/containers.ts
@@ -1,4 +1,4 @@
-import { ICard, IGame, IGameObject, IPlayer } from "./index.js"
+import type { ICard, IGame, IGameObject, IPlayer } from "./index.js"
 
 export enum ContainerVisibility {
     NONE = "none",
diff --git a/generic/index.ts b/generic/index.ts
index fe92094..8ab1c7e 100644
--- a/generic/index.ts
+++ b/generic/index.ts
@@ -1,5 +1,4 @@
-import { WebSocket } from "ws"
-import { IFireGemsStack, IMarket, IMarketStack, IPlayerBoard, IPlayerDiscard, IPlayerHand } from "./containers.js"
+import type { IFireGemsStack, IMarket, IMarketStack, IPlayerBoard, IPlayerDiscard, IPlayerHand } from "./containers.js"
 
 export const ClientQueryType = {
     ACTION: "action",
diff --git a/server/containers.ts b/server/containers.ts
index 6e9ef92..13894e9 100644
--- a/server/containers.ts
+++ b/server/containers.ts
@@ -1,6 +1,5 @@
-import { ContainerVisibility, IContainer, IFireGemsStack, IInteractibleContainer, IMarket, IMarketStack, IPlayableContainer, IPlayerBoard, IPlayerDiscard, IPlayerHand, IPlayerStack } from "../generic/containers.js"
-import { IGameObject, ICard, IPlayer, IGame } from "../generic/index.js"
-import { ISCard } from "./index.js"
+import type { IContainer, IFireGemsStack, IInteractibleContainer, IMarket, IMarketStack, IPlayableContainer, IPlayerBoard, IPlayerDiscard, IPlayerHand, IPlayerStack } from "../generic/containers.js"
+import type { ISCard } from "./index.js"
 
 export interface ISContainer<T> extends IContainer<T> {
     appendCards: (cards: Array<ISCard>) => void
diff --git a/server/index.ts b/server/index.ts
index 9ac1c24..dbf9651 100644
--- a/server/index.ts
+++ b/server/index.ts
@@ -1,4 +1,4 @@
-import { ICard, IEffect, IGame, ILobby, IPlayer, ITeam, ITurn, IUser, ServerMessage } from "../generic/index.js"
+import type { ICard, IEffect, IGame, ILobby, IPlayer, ITeam, ITurn, IUser, ServerMessage } from "../generic/index.js"
 import { WebSocket } from "ws"
 
 export interface ISClientProvider {