diff --git a/src/lib/api/context.ts b/src/lib/api/context.ts
index 97e4e4b6..99f352c6 100644
--- a/src/lib/api/context.ts
+++ b/src/lib/api/context.ts
@@ -1,7 +1,7 @@
 /**
  * Context creation, for graphql but also REST endpoints
  */
-import { Connector, VulcanGraphqlModel } from "@vulcanjs/graphql";
+import { Connector, VulcanGraphqlModel } from "@vulcanjs/graphql/server";
 
 import { createMongooseConnector } from "@vulcanjs/mongo";
 import { User, UserConnector, UserType } from "~/models/user.server";
diff --git a/src/lib/api/seed.ts b/src/lib/api/seed.ts
index 537bdf0c..1aa6b740 100644
--- a/src/lib/api/seed.ts
+++ b/src/lib/api/seed.ts
@@ -1,4 +1,4 @@
-import { createMutator, getModelConnector } from "@vulcanjs/graphql";
+import { createMutator, getModelConnector } from "@vulcanjs/graphql/server";
 import { User } from "~/models/user";
 
 const seed = async (context) => {
diff --git a/src/models/sampleModel.server.ts b/src/models/sampleModel.server.ts
index 142c69be..9643447b 100644
--- a/src/models/sampleModel.server.ts
+++ b/src/models/sampleModel.server.ts
@@ -7,7 +7,7 @@ import {
   CreateGraphqlModelOptionsServer,
   createGraphqlModelServer,
   VulcanGraphqlSchemaServer,
-} from "@vulcanjs/graphql";
+} from "@vulcanjs/graphql/server";
 import { createMongooseConnector } from "@vulcanjs/mongo";
 import merge from "lodash/merge";
 import { modelDef as modelDefShared } from "./sampleModel";
diff --git a/src/models/user.server.ts b/src/models/user.server.ts
index fd618f64..ed2cb85b 100644
--- a/src/models/user.server.ts
+++ b/src/models/user.server.ts
@@ -8,7 +8,7 @@ import {
   CreateGraphqlModelOptionsServer,
   createGraphqlModelServer,
   VulcanGraphqlSchemaServer,
-} from "@vulcanjs/graphql";
+} from "@vulcanjs/graphql/server";
 import { createMongooseConnector } from "@vulcanjs/mongo";
 
 import {
diff --git a/src/pages/api/account/changePassword.ts b/src/pages/api/account/changePassword.ts
index dcbd3187..a7be0d56 100644
--- a/src/pages/api/account/changePassword.ts
+++ b/src/pages/api/account/changePassword.ts
@@ -1,5 +1,5 @@
 import { Request } from "express";
-import { updateMutator } from "@vulcanjs/graphql";
+import { updateMutator } from "@vulcanjs/graphql/server";
 import { NextApiRequest, NextApiResponse } from "next";
 import { User, UserConnector, UserType } from "~/models/user.server";
 
diff --git a/src/pages/api/account/reset-password.tsx b/src/pages/api/account/reset-password.tsx
index 78688aa1..1e747cdc 100644
--- a/src/pages/api/account/reset-password.tsx
+++ b/src/pages/api/account/reset-password.tsx
@@ -1,5 +1,5 @@
 import { Request } from "express";
-import { updateMutator } from "@vulcanjs/graphql";
+import { updateMutator } from "@vulcanjs/graphql/server";
 import { NextApiRequest, NextApiResponse } from "next";
 import { User, UserConnector } from "~/models/user.server";
 import {
diff --git a/src/pages/api/account/signup.ts b/src/pages/api/account/signup.ts
index ad12e94e..5485b0b1 100644
--- a/src/pages/api/account/signup.ts
+++ b/src/pages/api/account/signup.ts
@@ -1,5 +1,5 @@
 import { Request } from "express";
-import { createMutator } from "@vulcanjs/graphql";
+import { createMutator } from "@vulcanjs/graphql/server";
 import { NextApiRequest, NextApiResponse } from "next";
 import { User, UserConnector, UserTypeServer } from "~/models/user.server";
 import { contextFromReq } from "~/lib/api/context";
diff --git a/src/pages/api/account/verify-email.ts b/src/pages/api/account/verify-email.ts
index a0f46b73..2567fc5f 100644
--- a/src/pages/api/account/verify-email.ts
+++ b/src/pages/api/account/verify-email.ts
@@ -1,5 +1,5 @@
 import { Request } from "express";
-import { updateMutator } from "@vulcanjs/graphql";
+import { updateMutator } from "@vulcanjs/graphql/server";
 import { NextApiRequest, NextApiResponse } from "next";
 import { User, UserConnector } from "~/models/user.server";
 import {
diff --git a/src/pages/api/graphql.ts b/src/pages/api/graphql.ts
index 819b33b3..bc2f0b20 100644
--- a/src/pages/api/graphql.ts
+++ b/src/pages/api/graphql.ts
@@ -3,7 +3,7 @@ import cors from "cors";
 import mongoose from "mongoose";
 import { ApolloServer, gql } from "apollo-server-express";
 import { makeExecutableSchema, mergeSchemas } from "graphql-tools";
-import { buildApolloSchema } from "@vulcanjs/graphql";
+import { buildApolloSchema } from "@vulcanjs/graphql/server";
 
 import mongoConnection from "~/lib/api/middlewares/mongoConnection";
 import corsOptions from "~/lib/api/cors";