diff --git a/benchmarks/index.ts b/benchmarks/index.ts
index 4334bb0e..57e71433 100644
--- a/benchmarks/index.ts
+++ b/benchmarks/index.ts
@@ -1,6 +1,6 @@
-import { generateApolloClient } from '@deep-foundation/hasura/client';
+import { generateApolloClient } from '@deep-foundation/hasura/client.js';
 import { Suite } from 'benchmark';
-import { DeepClient } from '../imports/client';
+import { DeepClient } from '../imports/client.js';
 import _ from 'lodash';
 import Debug from 'debug';
 
diff --git a/imports/bool_exp_to_sql.ts b/imports/bool_exp_to_sql.ts
index d1032604..2ae924be 100644
--- a/imports/bool_exp_to_sql.ts
+++ b/imports/bool_exp_to_sql.ts
@@ -1,8 +1,8 @@
 import Debug from 'debug';
-import { generateApolloClient } from '@deep-foundation/hasura/client';
-import { HasuraApi } from "@deep-foundation/hasura/api";
-import { generateMutation, generateSerial } from './gql';
-import { DeepClient } from './client';
+import { generateApolloClient } from '@deep-foundation/hasura/client.js';
+import { HasuraApi } from '@deep-foundation/hasura/api.js';
+import { generateMutation, generateSerial } from './gql/index.js';
+import { DeepClient } from './client.js';
 
 const debug = Debug('deeplinks:bool_exp');
 const log = debug.extend('log');
diff --git a/imports/client-handler.tsx b/imports/client-handler.tsx
index 7fad3252..f897b5e7 100644
--- a/imports/client-handler.tsx
+++ b/imports/client-handler.tsx
@@ -1,5 +1,6 @@
-import { DeepClient } from "./client";
-import { gql } from '@apollo/client';
+import { DeepClient } from './client.js';
+import apolloModule from '@apollo/client';
+const { gql} = apolloModule;
 
 export async function evalClientHandler({
   value,
diff --git a/imports/client.tsx b/imports/client.tsx
index efab4d99..e597aae4 100644
--- a/imports/client.tsx
+++ b/imports/client.tsx
@@ -1,17 +1,19 @@
 import atob from 'atob';
-import { ApolloClient, ApolloError, ApolloQueryResult, useApolloClient, gql, useQuery, useSubscription, FetchResult } from "@apollo/client";
-import { generateApolloClient, IApolloClient } from "@deep-foundation/hasura/client";
-import { useLocalStore } from "@deep-foundation/store/local";
+import apolloModule from '@apollo/client';
+import type { ApolloQueryResult } from '@apollo/client';
+const { gql, useQuery, useSubscription, useApolloClient } = apolloModule;
+import { generateApolloClient, IApolloClient } from '@deep-foundation/hasura/client.js';
+import { useLocalStore } from '@deep-foundation/store/local.js';
 import React, { createContext, useContext, useEffect, useMemo, useState } from "react";
 import { deprecate, inherits, inspect } from "util";
-import { deleteMutation, generateMutation, generateQuery, generateQueryData, generateSerial, IGenerateMutationBuilder, IGenerateMutationOptions, insertMutation, ISerialResult, updateMutation } from "./gql";
-import { Link, MinilinkCollection, minilinks, MinilinksInstance, MinilinksResult, useMinilinksApply, useMinilinksQuery, useMinilinksSubscription } from "./minilinks";
-import { awaitPromise } from "./promise";
-import { useTokenController } from "./react-token";
-import { reserve } from "./reserve";
+import { deleteMutation, generateMutation, generateQuery, generateQueryData, generateSerial, IGenerateMutationBuilder, IGenerateMutationOptions, insertMutation, ISerialResult, updateMutation } from './gql/index.js';
+import { Link, MinilinkCollection, minilinks, MinilinksInstance, MinilinksResult, useMinilinksApply, useMinilinksQuery, useMinilinksSubscription } from './minilinks.js';
+import { awaitPromise } from './promise.js';
+import { useTokenController } from './react-token.js';
+import { reserve } from './reserve.js';
 import Debug from 'debug';
-import { corePckg } from './core';
-import { BoolExpCan, BoolExpHandler, QueryLink, BoolExpSelector, BoolExpTree, BoolExpValue, MutationInputLink, MutationInputLinkPlain, MutationInputValue } from './client_types';
+import { corePckg } from './core.js';
+import { BoolExpCan, BoolExpHandler, QueryLink, BoolExpSelector, BoolExpTree, BoolExpValue, MutationInputLink, MutationInputLinkPlain, MutationInputValue } from './client_types.js';
 
 const debug = Debug('deeplinks:client');
 const log = debug.extend('log');
diff --git a/imports/core-symbols.tsx b/imports/core-symbols.tsx
index 277079a7..8062e5cc 100644
--- a/imports/core-symbols.tsx
+++ b/imports/core-symbols.tsx
@@ -1,4 +1,4 @@
-import { Packager, Package } from './packager';
+import { Packager, Package } from './packager.js';
 
 export const coreSymbolsPckg: Package = {
   package: {
diff --git a/imports/core.tsx b/imports/core.tsx
index 08b53e62..ae7acc17 100644
--- a/imports/core.tsx
+++ b/imports/core.tsx
@@ -1,4 +1,4 @@
-import { Packager, Package } from './packager';
+import { Packager, Package } from './packager.js';
 
 export const corePckg: Package = {
   package: {
diff --git a/imports/gql/index.ts b/imports/gql/index.ts
index 5a6122a4..a4f74b6f 100644
--- a/imports/gql/index.ts
+++ b/imports/gql/index.ts
@@ -1,5 +1,5 @@
 import gql from 'graphql-tag';
 
-export * from './mutation';
-export * from './query';
-export * from './serial';
+export * from './mutation.js';
+export * from './query.js';
+export * from './serial.js';
diff --git a/imports/gql/serial.ts b/imports/gql/serial.ts
index 5b49acde..faf3f571 100644
--- a/imports/gql/serial.ts
+++ b/imports/gql/serial.ts
@@ -1,6 +1,6 @@
 import Debug from 'debug';
 import gql from 'graphql-tag';
-import { SerialOperationType, Table, SerialOperation, SerialOperationDetails } from '../client';
+import { SerialOperationType, Table, SerialOperation, SerialOperationDetails } from '../client.js';
 
 const debug = Debug('deeplinks:gql:serial');
 const log = debug.extend('log');
diff --git a/imports/handlers.ts b/imports/handlers.ts
index f64f6644..aed5f1cd 100644
--- a/imports/handlers.ts
+++ b/imports/handlers.ts
@@ -1,6 +1,6 @@
 import { assert } from 'chai';
-import { generateApolloClient } from "@deep-foundation/hasura/client";
-import { DeepClient } from "./client";
+import { generateApolloClient } from '@deep-foundation/hasura/client.js';
+import { DeepClient } from './client.js';
 import _ from 'lodash';
 
 const apolloClient = generateApolloClient({
diff --git a/imports/jwt.ts b/imports/jwt.ts
index c8480f32..d3a705da 100644
--- a/imports/jwt.ts
+++ b/imports/jwt.ts
@@ -1,4 +1,4 @@
-import { generateApolloClient } from '@deep-foundation/hasura/client';
+import { generateApolloClient } from '@deep-foundation/hasura/client.js';
 import JWT from 'jsonwebtoken';
 
 export interface Options {
diff --git a/imports/minilinks-query.ts b/imports/minilinks-query.ts
index ae67fff3..f881a1bb 100644
--- a/imports/minilinks-query.ts
+++ b/imports/minilinks-query.ts
@@ -1,6 +1,6 @@
-import { _serialize, _boolExpFields, serializeWhere, serializeQuery } from "./client";
-import { BoolExpLink, ComparasionType, QueryLink } from "./client_types";
-import { MinilinkCollection, MinilinksGeneratorOptions, Link } from "./minilinks";
+import { _serialize, _boolExpFields, serializeWhere, serializeQuery } from './client.js';
+import { BoolExpLink, ComparasionType, QueryLink } from './client_types.js';
+import { MinilinkCollection, MinilinksGeneratorOptions, Link } from './minilinks.js';
 
 export interface BoolExpLinkMinilinks extends BoolExpLink {
   _applies?: ComparasionType<number>;
diff --git a/imports/minilinks.ts b/imports/minilinks.ts
index cd2469bf..dce12d52 100644
--- a/imports/minilinks.ts
+++ b/imports/minilinks.ts
@@ -1,12 +1,12 @@
-import _remove from 'lodash/remove';
-import _isEqual from 'lodash/isEqual';
-import _isEqualWith from 'lodash/isEqualWith';
+import _remove from 'lodash/remove.js';
+import _isEqual from 'lodash/isEqual.js';
+import _isEqualWith from 'lodash/isEqualWith.js';
 import EventEmitter from 'events';
 import { useCallback, useEffect, useMemo, useRef, useState } from 'react';
 import Debug from 'debug';
 import { inherits } from 'util';
-import { minilinksQuery, minilinksQueryIs } from './minilinks-query';
-import { QueryLink } from './client_types';
+import { minilinksQuery, minilinksQueryIs } from './minilinks-query.js';
+import { QueryLink } from './client_types.js';
 
 const debug = Debug('deeplinks:minilinks');
 const log = debug.extend('log');
diff --git a/imports/packager.ts b/imports/packager.ts
index 1f680424..a52a83fa 100644
--- a/imports/packager.ts
+++ b/imports/packager.ts
@@ -1,7 +1,7 @@
 import Debug from 'debug';
-import { DeepClient } from './client';
-import type { DeepSerialOperation } from './client';
-import { Link, minilinks, MinilinksResult } from './minilinks';
+import { DeepClient } from './client.js';
+import type { DeepSerialOperation } from './client.js';
+import { Link, minilinks, MinilinksResult } from './minilinks.js';
 
 const debug = Debug('deeplinks:packager');
 const log = debug.extend('log');
diff --git a/imports/permission.ts b/imports/permission.ts
index a99f9f57..b35c49af 100644
--- a/imports/permission.ts
+++ b/imports/permission.ts
@@ -1,4 +1,4 @@
-import { HasuraApi } from "@deep-foundation/hasura/api";
+import { HasuraApi } from '@deep-foundation/hasura/api.js';
 
 export const permissions = async (api: HasuraApi, table: string | { name: string; schema: string; }, actions: {
   role: string;
diff --git a/imports/promise.ts b/imports/promise.ts
index 038ef326..1ae9e8a0 100644
--- a/imports/promise.ts
+++ b/imports/promise.ts
@@ -1,6 +1,6 @@
-import { ApolloClient } from "@apollo/client";
+import type { ApolloClient } from '@apollo/client';
 import Debug from 'debug';
-import { generateQuery, generateQueryData, generateSerial, insertMutation } from "./gql";
+import { generateQuery, generateQueryData, generateSerial, insertMutation } from './gql/index.js';
 
 
 const debug = Debug('deeplinks:promise');
diff --git a/imports/react-token.tsx b/imports/react-token.tsx
index dd4da9f4..f806cb69 100644
--- a/imports/react-token.tsx
+++ b/imports/react-token.tsx
@@ -1,7 +1,7 @@
 import React from 'react';
 import uniqid from 'uniqid';
-import { TokenContext } from '@deep-foundation/react-hasura/token-context';
-import { useLocalStore } from '@deep-foundation/store/local';
+import { TokenContext } from '@deep-foundation/react-hasura/token-context.js';
+import { useLocalStore } from '@deep-foundation/store/local.js';
 
 export function useTokenController() {
   return useLocalStore('dc-dg-token', '');
diff --git a/imports/reserve.ts b/imports/reserve.ts
index bf53f874..70021a3c 100644
--- a/imports/reserve.ts
+++ b/imports/reserve.ts
@@ -1,5 +1,7 @@
-import { ApolloClient, gql } from "@apollo/client";
-import { generateQuery, generateQueryData, generateSerial, insertMutation } from "./gql";
+import apolloModule from '@apollo/client';
+import type { ApolloClient } from '@apollo/client';
+const { gql } = apolloModule;
+import { generateQuery, generateQueryData, generateSerial, insertMutation } from './gql/index.js';
 
 export interface ReservedOptions {
   count: number;
diff --git a/imports/reserved.ts b/imports/reserved.ts
index 4449474b..c78dadc0 100644
--- a/imports/reserved.ts
+++ b/imports/reserved.ts
@@ -1,5 +1,8 @@
-import { ApolloClient, gql } from "@apollo/client";
-import { generateQuery, generateQueryData } from "./gql";
+import apolloModule from '@apollo/client';
+import type { ApolloClient } from '@apollo/client';
+const { gql } = apolloModule;
+
+import { generateQuery, generateQueryData } from './gql/index.js';
 
 export interface ReseveOptions {
   count: number;
diff --git a/imports/router/authorization.ts b/imports/router/authorization.ts
index c3fc14cf..56253234 100644
--- a/imports/router/authorization.ts
+++ b/imports/router/authorization.ts
@@ -1,10 +1,10 @@
-import { jwt } from '../jwt';
-import { generateRemoteSchema } from '@deep-foundation/hasura/remote-schema';
+import { jwt } from '../jwt.js';
+import { generateRemoteSchema } from '@deep-foundation/hasura/remote-schema.js';
 import gql from 'graphql-tag';
 import { ApolloServer } from 'apollo-server-express';
 import { ApolloServerPluginDrainHttpServer, ApolloServerPluginLandingPageGraphQLPlayground } from 'apollo-server-core';
-import { generateApolloClient } from '@deep-foundation/hasura/client';
-import { DeepClient } from '../client';
+import { generateApolloClient } from '@deep-foundation/hasura/client.js';
+import { DeepClient } from '../client.js';
 import Chance from 'chance';
 
 const chance = new Chance();
diff --git a/imports/router/guest.ts b/imports/router/guest.ts
index ccb2c737..d6cf10ea 100644
--- a/imports/router/guest.ts
+++ b/imports/router/guest.ts
@@ -1,9 +1,9 @@
-import { jwt } from '../jwt';
-import { generateApolloClient } from '@deep-foundation/hasura/client';
+import { jwt } from '../jwt.js';
+import { generateApolloClient } from '@deep-foundation/hasura/client.js';
 import gql from 'graphql-tag';
-import { generateSerial, insertMutation } from '../gql';
+import { generateSerial, insertMutation } from '../gql/index.js';
 import { ApolloServer } from 'apollo-server-express';
-import { DeepClient } from '../client';
+import { DeepClient } from '../client.js';
 import { ApolloServerPluginDrainHttpServer, ApolloServerPluginLandingPageGraphQLPlayground } from 'apollo-server-core';
 
 const JWT_SECRET = process.env.JWT_SECRET;
diff --git a/imports/router/index.ts b/imports/router/index.ts
index c97b4367..2039d8cf 100644
--- a/imports/router/index.ts
+++ b/imports/router/index.ts
@@ -1,10 +1,10 @@
 import express from 'express';
-import links from './links';
-import values from './values';
-import reservedCleaner from './reserved-cleaner';
-import reserved from './reserved';
-import healthz from './healthz';
-import scheduler from './scheduler';
+import links from './links.js';
+import values from './values.js';
+import reservedCleaner from './reserved-cleaner.js';
+import reserved from './reserved.js';
+import healthz from './healthz.js';
+import scheduler from './scheduler.js';
 
 const router:express.IRouter = express.Router();
 
diff --git a/imports/router/jwt.ts b/imports/router/jwt.ts
index 175f35c1..94eebf95 100644
--- a/imports/router/jwt.ts
+++ b/imports/router/jwt.ts
@@ -1,10 +1,10 @@
-import { jwt } from '../jwt';
-import { generateRemoteSchema } from '@deep-foundation/hasura/remote-schema';
+import { jwt } from '../jwt.js';
+import { generateRemoteSchema } from '@deep-foundation/hasura/remote-schema.js';
 import gql from 'graphql-tag';
 import { ApolloServer } from 'apollo-server-express';
 import { ApolloServerPluginDrainHttpServer, ApolloServerPluginLandingPageGraphQLPlayground } from 'apollo-server-core';
-import { generateApolloClient } from '@deep-foundation/hasura/client';
-import { DeepClient } from '../client';
+import { generateApolloClient } from '@deep-foundation/hasura/client.js';
+import { DeepClient } from '../client.js';
 
 const apolloClient = generateApolloClient({
   path: `${process.env.DEEPLINKS_HASURA_PATH}/v1/graphql`,
diff --git a/imports/router/links.ts b/imports/router/links.ts
index d95d005e..0caefd18 100644
--- a/imports/router/links.ts
+++ b/imports/router/links.ts
@@ -1,14 +1,15 @@
 import Debug from 'debug';
 
-import { HasuraApi } from "@deep-foundation/hasura/api";
-import { generateApolloClient } from '@deep-foundation/hasura/client';
-// import { sql } from '@deep-foundation/hasura/sql';
-import { gql } from '@apollo/client';
-
-import { DeepClient } from '../client';
-import { ContainerController } from '../container-controller';
-import { ALLOWED_IDS, DENIED_IDS } from '../global-ids';
-import { findPromiseLink, reject, resolve } from '../promise';
+import { HasuraApi } from '@deep-foundation/hasura/api.js';
+import { generateApolloClient } from '@deep-foundation/hasura/client.js';
+// import { sql } from '@deep-foundation/hasura/sql.js';
+import apolloModule from '@apollo/client';
+const { gql} = apolloModule;
+
+import { DeepClient } from '../client.js';
+import { ContainerController } from '../container-controller.js';
+import { ALLOWED_IDS, DENIED_IDS } from '../global-ids.js';
+import { findPromiseLink, reject, resolve } from '../promise.js';
 import { promisify } from 'util';
 import {exec} from 'child_process';
 import waitOn from 'wait-on';
diff --git a/imports/router/packager.ts b/imports/router/packager.ts
index e29fb050..31601941 100644
--- a/imports/router/packager.ts
+++ b/imports/router/packager.ts
@@ -1,14 +1,14 @@
-import { generateApolloClient } from '@deep-foundation/hasura/client';
+import { generateApolloClient } from '@deep-foundation/hasura/client.js';
 import { ApolloServerPluginDrainHttpServer, ApolloServerPluginLandingPageGraphQLPlayground } from 'apollo-server-core';
 import { ApolloServer } from 'apollo-server-express';
 import Gists from 'gists';
 import gql from 'graphql-tag';
-import { isEmpty } from 'lodash';
+import _ from 'lodash';
 import os from 'os';
 import path from 'path';
 import url from 'url';
-import { DeepClient } from '../client';
-import { Packager } from '../packager';
+import { DeepClient } from '../client.js';
+import { Packager } from '../packager.js';
 
 const tmpdir = os.tmpdir();
 
@@ -141,10 +141,10 @@ export const packagerPublishCore = async (errors = [], address: string, id: numb
       if (deepPckgContent?.errors?.length) {
         errors.push(...deepPckgContent.errors);
       }
-      if (isEmpty(deepPckgContent?.package)) {
+      if (_.isEmpty(deepPckgContent?.package)) {
         errors.push('!package');
       }
-      if (isEmpty(deepPckgContent?.data)) {
+      if (_.isEmpty(deepPckgContent?.data)) {
         errors.push('!data');
       }
       if (errors.length) return { errors };
diff --git a/imports/router/reserved-cleaner.ts b/imports/router/reserved-cleaner.ts
index ee6aeb61..3dabb26a 100644
--- a/imports/router/reserved-cleaner.ts
+++ b/imports/router/reserved-cleaner.ts
@@ -1,6 +1,6 @@
-import { generateQuery, generateQueryData } from '../gql';
-import { HasuraApi } from '@deep-foundation/hasura/api';
-import { generateApolloClient } from '@deep-foundation/hasura/client';
+import { generateQuery, generateQueryData } from '../gql/index.js';
+import { HasuraApi } from '@deep-foundation/hasura/api.js';
+import { generateApolloClient } from '@deep-foundation/hasura/client.js';
 
 const RESERVED_LIFETIME_MS = +process.env.RESERVED_LIFETIME || 24 * 60 * 60 * 1000;
 
diff --git a/imports/router/reserved.ts b/imports/router/reserved.ts
index 8cfbf2bc..63d4ebb7 100644
--- a/imports/router/reserved.ts
+++ b/imports/router/reserved.ts
@@ -1,6 +1,6 @@
-import { generateApolloClient } from '@deep-foundation/hasura/client';
-import { HasuraApi } from "@deep-foundation/hasura/api";
-import { generateMutation, generateSerial, insertMutation } from '../gql';
+import { generateApolloClient } from '@deep-foundation/hasura/client.js';
+import { HasuraApi } from '@deep-foundation/hasura/api.js';
+import { generateMutation, generateSerial, insertMutation } from '../gql/index.js';
 import Debug from 'debug';
 
 const debug = Debug('deeplinks:eh:reserved');
diff --git a/imports/router/scheduler.ts b/imports/router/scheduler.ts
index bf91384b..0dd65742 100644
--- a/imports/router/scheduler.ts
+++ b/imports/router/scheduler.ts
@@ -1,22 +1,23 @@
 import Debug from 'debug';
 
-import { generateApolloClient } from '@deep-foundation/hasura/client';
-import { HasuraApi } from "@deep-foundation/hasura/api";
-// import { sql } from '@deep-foundation/hasura/sql';
-import { gql } from '@apollo/client';
+import { generateApolloClient } from '@deep-foundation/hasura/client.js';
+import { HasuraApi } from '@deep-foundation/hasura/api.js';
+// import { sql } from '@deep-foundation/hasura/sql.js';
+import apolloModule from '@apollo/client';
+const { gql} = apolloModule;
 import vm from 'vm';
 
-import { permissions } from '../permission';
-import { findPromiseLink, reject, resolve } from '../promise';
-import { DeepClient } from '../client';
-import { ALLOWED_IDS, DENIED_IDS } from '../global-ids';
+import { permissions } from '../permission.js';
+import { findPromiseLink, reject, resolve } from '../promise.js';
+import { DeepClient } from '../client.js';
+import { ALLOWED_IDS, DENIED_IDS } from '../global-ids.js';
 import axios from 'axios';
 import crypto from 'crypto';
 import { 
   handleOperation,
-} from './links';
-import { boolExpToSQL } from '../bool_exp_to_sql';
-import { useRunner, processPromises } from './links';
+} from './links.js';
+import { boolExpToSQL } from '../bool_exp_to_sql.js';
+import { useRunner, processPromises } from './links.js';
 
 const SCHEMA = 'public';
 
diff --git a/imports/router/values.ts b/imports/router/values.ts
index e1054172..b8f06a90 100644
--- a/imports/router/values.ts
+++ b/imports/router/values.ts
@@ -1,22 +1,23 @@
 import Debug from 'debug';
 
-import { generateApolloClient } from '@deep-foundation/hasura/client';
-import { HasuraApi } from "@deep-foundation/hasura/api";
-// import { sql } from '@deep-foundation/hasura/sql';
-import { gql } from '@apollo/client';
+import { generateApolloClient } from '@deep-foundation/hasura/client.js';
+import { HasuraApi } from '@deep-foundation/hasura/api.js';
+// import { sql } from '@deep-foundation/hasura/sql.js';
+import apolloModule from '@apollo/client';
+const { gql} = apolloModule;
 import vm from 'vm';
 
-import { permissions } from '../permission';
-import { findPromiseLink, reject, resolve } from '../promise';
-import { DeepClient } from '../client';
-import { ALLOWED_IDS, DENIED_IDS } from '../global-ids';
+import { permissions } from '../permission.js';
+import { findPromiseLink, reject, resolve } from '../promise.js';
+import { DeepClient } from '../client.js';
+import { ALLOWED_IDS, DENIED_IDS } from '../global-ids.js';
 import axios from 'axios';
 import crypto from 'crypto';
 import { 
   handleOperation,
   handleSelectorOperation,
-} from './links';
-import { boolExpToSQL } from '../bool_exp_to_sql';
+} from './links.js';
+import { boolExpToSQL } from '../bool_exp_to_sql.js';
 
 const SCHEMA = 'public';
 
diff --git a/imports/type-table.ts b/imports/type-table.ts
index 940d27d5..ed1bf375 100644
--- a/imports/type-table.ts
+++ b/imports/type-table.ts
@@ -1,6 +1,6 @@
-import { HasuraApi } from '@deep-foundation/hasura/api';
-import { sql } from '@deep-foundation/hasura/sql';
-import { DeepClient } from './client';
+import { HasuraApi } from '@deep-foundation/hasura/api.js';
+import { sql } from '@deep-foundation/hasura/sql.js';
+import { DeepClient } from './client.js';
 
 export interface ITypeTableStringOptions {
   schemaName: string;
diff --git a/index.ts b/index.ts
index a67f4bf4..04ea2012 100644
--- a/index.ts
+++ b/index.ts
@@ -1,23 +1,25 @@
 import atob from 'atob';
 import { URL } from 'url';
 import express from 'express';
-import router from './imports/router/index';
-import generateJwtServer from './imports/router/jwt';
-import generateGuestServer from './imports/router/guest';
-import generatePackagerServer from './imports/router/packager';
-import generateAuthorizationServer from './imports/router/authorization';
+import router from './imports/router/index.js';
+import generateJwtServer from './imports/router/jwt.js';
+import generateGuestServer from './imports/router/guest.js';
+import generatePackagerServer from './imports/router/packager.js';
+import generateAuthorizationServer from './imports/router/authorization.js';
 import axios from 'axios';
 import http from 'http';
 import { createProxyMiddleware, responseInterceptor } from 'http-proxy-middleware';
-import expressPlayground from 'graphql-playground-middleware-express';
+import { createRequire } from "module";
+const require = createRequire(import.meta.url);
+const expressPlayground = require('graphql-playground-middleware-express').default;
 import moesif from 'moesif-nodejs';
 import Debug from 'debug';
 import waitOn from 'wait-on';
-import { generateApolloClient } from '@deep-foundation/hasura/client';
-import { DeepClient } from './imports/client';
+import { generateApolloClient } from '@deep-foundation/hasura/client.js';
+import { DeepClient } from './imports/client.js';
 import gql from 'graphql-tag';
-import { containerController, DOCKER, getJwt } from './imports/router/links';
-import { MinilinkCollection, MinilinksGeneratorOptionsDefault } from './imports/minilinks';
+import { containerController, DOCKER, getJwt } from './imports/router/links.js';
+import { MinilinkCollection, MinilinksGeneratorOptionsDefault } from './imports/minilinks.js';
 import _ from 'lodash';
 import Cors from 'cors';
 
diff --git a/package.json b/package.json
index e143d239..47929b24 100644
--- a/package.json
+++ b/package.json
@@ -2,9 +2,10 @@
   "name": "@deep-foundation/deeplinks",
   "version": "0.0.176",
   "license": "Unlicense",
+  "type": "module",
   "scripts": {
     "dev": "(cd local && docker-compose down || true) && cross-env npm_config_yes=true JWT_SECRET=\"{\\\"type\\\":\\\"HS256\\\",\\\"key\\\":\\\"3EK6FD+o0+c7tzBNVfjpMkNDi2yARAAKzQlk8O2IKoxQu4nF7EdAh8s3TwpHwrdWT6R\\\"}\" MIGRATIONS_HASURA_PATH=localhost:8080 MIGRATIONS_HASURA_SSL=0 MIGRATIONS_HASURA_SECRET=myadminsecretkey MIGRATIONS_DEEPLINKS_URL=http://host.docker.internal:3006 DEEPLINKS_HASURA_PATH=localhost:8080 DEEPLINKS_HASURA_SSL=0 DEEPLINKS_HASURA_SECRET=myadminsecretkey PORT=3006 npm run launch",
-    "launch": "ts-node ./index.ts;",
+    "launch": "npm run package:build && node ./index.js;",
     "bundle-mathjs": "export LIBNAME=mathjs; node ./bundles/deeplinks-bundler-prepare.js && webpack && node ./bundles/deeplinks-bundler-postbundle.js",
     "bundle-mathjs-test": "node ./bundles/mathjs.js",
     "bundle-jsonschema": "export LIBNAME=jsonschema;  node ./bundles/deeplinks-bundler-prepare.js && webpack && node ./bundles/deeplinks-bundler-postbundle.js",
diff --git a/tests/bool_exp.ts b/tests/bool_exp.ts
index f321f2fb..9c6a0270 100644
--- a/tests/bool_exp.ts
+++ b/tests/bool_exp.ts
@@ -1,5 +1,5 @@
-import { HasuraApi } from "@deep-foundation/hasura/api";
-import { generateApolloClient } from "@deep-foundation/hasura/client";
+import { HasuraApi } from '@deep-foundation/hasura/api.js';
+import { generateApolloClient } from '@deep-foundation/hasura/client.js';
 import { assert, expect } from 'chai';
 import { applyBoolExpToLink, userReplaceSymbol } from "../imports/bool_exp_to_sql";
 import { DeepClient } from "../imports/client";
diff --git a/tests/client.tsx b/tests/client.tsx
index 5c0b4d6f..5987ce04 100644
--- a/tests/client.tsx
+++ b/tests/client.tsx
@@ -1,4 +1,4 @@
-import { generateApolloClient } from "@deep-foundation/hasura/client";
+import { generateApolloClient } from '@deep-foundation/hasura/client.js';
 import { DeepClient, SerialOperation, useDeepSubscription } from "../imports/client";
 import { assert } from 'chai';
 import { BoolExpLink, MutationInputLink } from "../imports/client_types";
@@ -7,7 +7,8 @@ import { createSerialOperation } from "../imports/gql";
 import {render, screen, waitFor} from '@testing-library/react'
 import { DeepProvider } from '../imports/client';
 import React, { useEffect } from "react";
-import { ApolloProvider } from "@apollo/client";
+import apolloModule from '@apollo/client';
+const { ApolloProvider } = apolloModule;
 import '@testing-library/jest-dom';
 
 
diff --git a/tests/demo.ts b/tests/demo.ts
index b2a3d29a..41ae44e8 100644
--- a/tests/demo.ts
+++ b/tests/demo.ts
@@ -1,4 +1,4 @@
-import { generateApolloClient } from "@deep-foundation/hasura/client";
+import { generateApolloClient } from '@deep-foundation/hasura/client.js';
 import { DeepClient } from "../imports/client";
 import { assert, expect } from 'chai';
 import { stringify } from "querystring";
diff --git a/tests/handlers.ts b/tests/handlers.ts
index 812ee140..c8eeb0f2 100644
--- a/tests/handlers.ts
+++ b/tests/handlers.ts
@@ -1,5 +1,5 @@
-import { generateApolloClient } from "@deep-foundation/hasura/client";
-import { HasuraApi } from "@deep-foundation/hasura/api";
+import { generateApolloClient } from '@deep-foundation/hasura/client.js';
+import { HasuraApi } from '@deep-foundation/hasura/api.js';
 import { DeepClient } from "../imports/client";
 import { assert } from 'chai';
 import gql from "graphql-tag";
@@ -7,7 +7,7 @@ import Debug from 'debug';
 import fetch from 'node-fetch';
 import { insertHandler, insertSelector, insertSelectorItems, deleteHandler, deleteSelector }  from "../imports/handlers";
 import _ from 'lodash';
-import { _ids } from '../imports/client';
+import { _ids } from '../imports/client.js';
 
 const debug = Debug('deeplinks:tests:handlers');
 const log = debug.extend('log');
diff --git a/tests/join-insert.ts b/tests/join-insert.ts
index 8f87640d..a1897a40 100644
--- a/tests/join-insert.ts
+++ b/tests/join-insert.ts
@@ -1,4 +1,4 @@
-import { generateApolloClient } from "@deep-foundation/hasura/client";
+import { generateApolloClient } from '@deep-foundation/hasura/client.js';
 import { DeepClient } from "../imports/client";
 import { assert } from 'chai';
 
diff --git a/tests/messanger.ts b/tests/messanger.ts
index 37ceb1e8..996f30b3 100644
--- a/tests/messanger.ts
+++ b/tests/messanger.ts
@@ -1,4 +1,4 @@
-import { generateApolloClient } from "@deep-foundation/hasura/client";
+import { generateApolloClient } from '@deep-foundation/hasura/client.js';
 import { DeepClient } from "../imports/client";
 import { assert } from 'chai';
 import { delay } from "../imports/promise";
diff --git a/tests/minilinks-query.ts b/tests/minilinks-query.ts
index 4ce81b12..a29ac9a2 100644
--- a/tests/minilinks-query.ts
+++ b/tests/minilinks-query.ts
@@ -1,5 +1,5 @@
 import { assert, expect } from 'chai';
-import { MinilinkCollection, MinilinksGeneratorOptionsDefault } from '../imports/minilinks';
+import { MinilinkCollection, MinilinksGeneratorOptionsDefault } from '../imports/minilinks.js';
 
 describe('minilinks-query', () => {
   it(`minilinks.query { _or: [{ id: { _eq: 1 } }, { id: { _eq: 2 } }] }`, async () => {
diff --git a/tests/minilinks.ts b/tests/minilinks.ts
index d4a3fc9d..7f194eb1 100644
--- a/tests/minilinks.ts
+++ b/tests/minilinks.ts
@@ -1,5 +1,5 @@
 import { assert, expect } from 'chai';
-import { MinilinkCollection, MinilinksGeneratorOptionsDefault } from '../imports/minilinks';
+import { MinilinkCollection, MinilinksGeneratorOptionsDefault } from '../imports/minilinks.js';
 
 describe('minilinks', () => {
   it(`add 1 3 5`, async () => {
diff --git a/tests/packager.ts b/tests/packager.ts
index c8d0c42d..827e8630 100644
--- a/tests/packager.ts
+++ b/tests/packager.ts
@@ -1,7 +1,8 @@
-import { generateApolloClient } from "@deep-foundation/hasura/client";
+import { generateApolloClient } from '@deep-foundation/hasura/client.js';
 import { DeepClient } from "../imports/client";
 import { assert } from 'chai';
-import { gql } from "@apollo/client";
+import apolloModule from '@apollo/client';
+const { gql } = apolloModule;
 import { PackageItem, Packager, sort } from "../imports/packager";
 import type { Package } from "../imports/packager";
 import { minilinks } from "../imports/minilinks";
diff --git a/tests/permissions.ts b/tests/permissions.ts
index ff9afb59..d3d8c9e1 100644
--- a/tests/permissions.ts
+++ b/tests/permissions.ts
@@ -1,4 +1,4 @@
-import { generateApolloClient } from "@deep-foundation/hasura/client";
+import { generateApolloClient } from '@deep-foundation/hasura/client.js';
 import { DeepClient } from "../imports/client";
 import { assert, expect } from 'chai';
 import { stringify } from "querystring";
diff --git a/tests/reserve.ts b/tests/reserve.ts
index 2eeede5f..a18e1fab 100644
--- a/tests/reserve.ts
+++ b/tests/reserve.ts
@@ -1,4 +1,4 @@
-import { generateApolloClient } from "@deep-foundation/hasura/client";
+import { generateApolloClient } from '@deep-foundation/hasura/client.js';
 import { DeepClient } from "../imports/client";
 import { assert } from 'chai';
 
diff --git a/tests/selectors.ts b/tests/selectors.ts
index aca7099f..bec08d65 100644
--- a/tests/selectors.ts
+++ b/tests/selectors.ts
@@ -1,4 +1,4 @@
-import { generateApolloClient } from "@deep-foundation/hasura/client";
+import { generateApolloClient } from '@deep-foundation/hasura/client.js';
 import { DeepClient } from "../imports/client";
 import { assert, expect } from 'chai';
 import { stringify } from "querystring";
diff --git a/tests/sync-handlers.ts b/tests/sync-handlers.ts
index 8a79fce9..6dc1780f 100644
--- a/tests/sync-handlers.ts
+++ b/tests/sync-handlers.ts
@@ -1,14 +1,14 @@
 import { assert, expect } from 'chai';
-import { generateApolloClient } from "@deep-foundation/hasura/client";
+import { generateApolloClient } from '@deep-foundation/hasura/client.js';
 import { DeepClient } from "../imports/client";
 import { insertHandler, insertSelector, insertSelectorItem, deleteHandler, deleteSelector }  from "../imports/handlers";
 import { HasuraApi } from'@deep-foundation/hasura/api';
-import { sql } from '@deep-foundation/hasura/sql';
-import { _ids } from '../imports/client';
+import { sql } from '@deep-foundation/hasura/sql.js';
+import { _ids } from '../imports/client.js';
 import { createPrepareFunction, createDeepClientFunction, createSyncInsertTriggerFunction, dropSyncInsertTriggerFunction, dropSyncInsertTrigger, createSyncInsertTrigger, createSyncDeleteTriggerFunction, createSyncDeleteTrigger, dropSyncDeleteTriggerFunction, dropSyncDeleteTrigger, createSyncDeleteStringsTrigger, createSyncDeleteStringsTriggerFunction, createSyncInsertStringsTrigger, createSyncInsertStringsTriggerFunction, createSyncUpdateStringsTrigger, createSyncUpdateStringsTriggerFunction, dropSyncDeleteStringsTrigger, dropSyncDeleteStringsTriggerFunction, dropSyncInsertStringsTrigger, dropSyncInsertStringsTriggerFunction, dropSyncUpdateStringsTrigger, dropSyncUpdateStringsTriggerFunction, createSyncDeleteNumbersTrigger, createSyncDeleteNumbersTriggerFunction, createSyncInsertNumbersTrigger, createSyncInsertNumbersTriggerFunction, createSyncUpdateNumbersTrigger, createSyncUpdateNumbersTriggerFunction, dropSyncDeleteNumbersTrigger, dropSyncDeleteNumbersTriggerFunction, dropSyncInsertNumbersTrigger, dropSyncInsertNumbersTriggerFunction, dropSyncUpdateNumbersTrigger, dropSyncUpdateNumbersTriggerFunction, createSyncDeleteObjectsTrigger, createSyncDeleteObjectsTriggerFunction, createSyncInsertObjectsTrigger, createSyncInsertObjectsTriggerFunction, createSyncUpdateObjectsTrigger, createSyncUpdateObjectsTriggerFunction, dropSyncDeleteObjectsTrigger, dropSyncDeleteObjectsTriggerFunction, dropSyncInsertObjectsTrigger, dropSyncInsertObjectsTriggerFunction, dropSyncUpdateObjectsTrigger, dropSyncUpdateObjectsTriggerFunction } from "../migrations/1655979260869-sync-handlers";
 import Debug from 'debug';
-import { MutationInputLink } from '../imports/client_types';
-// import { _ids } from '../imports/client';
+import { MutationInputLink } from '../imports/client_types.js';
+// import { _ids } from '../imports/client.js';
 
 const debug = Debug('deeplinks:tests:sync-handlers');
 const log = debug.extend('log');
diff --git a/tests/tree.ts b/tests/tree.ts
index 4ff5a141..caee32c4 100644
--- a/tests/tree.ts
+++ b/tests/tree.ts
@@ -1,9 +1,9 @@
-import { generateApolloClient } from "@deep-foundation/hasura/client";
-import { HasuraApi } from "@deep-foundation/hasura/api";
+import { generateApolloClient } from '@deep-foundation/hasura/client.js';
+import { HasuraApi } from '@deep-foundation/hasura/api.js';
 import { DeepClient } from "../imports/client";
 import { assert } from 'chai';
 import { insertHandler, deleteHandler }  from "../imports/handlers";
-import { _ids } from '../imports/client';
+import { _ids } from '../imports/client.js';
 import { delay } from "../imports/promise";
 
 jest.setTimeout(120000);
diff --git a/tests/typing.ts b/tests/typing.ts
index 7853831a..65d9e24b 100644
--- a/tests/typing.ts
+++ b/tests/typing.ts
@@ -1,4 +1,4 @@
-import { generateApolloClient } from "@deep-foundation/hasura/client";
+import { generateApolloClient } from '@deep-foundation/hasura/client.js';
 import { DeepClient } from "../imports/client";
 import { assert } from 'chai';