diff --git a/packages/adapter-ameyo/lib/api.ts b/packages/adapter-ameyo/lib/api.ts
index 00b997d..c03500e 100644
--- a/packages/adapter-ameyo/lib/api.ts
+++ b/packages/adapter-ameyo/lib/api.ts
@@ -1,6 +1,6 @@
-import {getResponseWithoutCors} from "@universal-call-sdk/common/lib/main.ts";
-import {RequestKeys} from "./types";
-import {RequestType} from "@universal-call-sdk/common/lib/main.ts";
+import getResponseWithoutCors from "@universal-call-sdk/common/lib/utils/getResponseWithoutCors.ts";
+import { RequestKeys} from "./types";
+import RequestType from "@universal-call-sdk/common/lib/types/RequestType.ts";
 
 
 const BASE_AMEYO_URL = window.BASE_AMEYO_URL;
diff --git a/packages/adapter-ameyo/lib/main.ts b/packages/adapter-ameyo/lib/main.ts
index 4550c76..bfcdc36 100644
--- a/packages/adapter-ameyo/lib/main.ts
+++ b/packages/adapter-ameyo/lib/main.ts
@@ -1,5 +1,5 @@
-import IAdapter from "@universal-call-sdk/common/Interfaces/IAdapter.ts";
-import GenericObject from "@universal-call-sdk/common/types/GenericObject.ts";
+import IAdapter from "@universal-call-sdk/common/lib/Interfaces/IAdapter.ts";
+import GenericObject from "@universal-call-sdk/common/lib/types/GenericObject.ts";
 import {AmeyoInitializationOptions, RequestKeys, StateType} from "./types.ts";
 import MessagingType from "../types/MessagingType.ts";
 import {
diff --git a/packages/common/dist/common.js b/packages/common/dist/common.js
index 01d5d80..8b13789 100644
--- a/packages/common/dist/common.js
+++ b/packages/common/dist/common.js
@@ -1,49 +1 @@
-var l = /* @__PURE__ */ ((t) => (t.JSON = "JSON", t.RAW = "RAW", t))(l || {});
-const o = ({
-  url: t,
-  method: e,
-  data: a = {},
-  requestKey: n,
-  requestType: s = l.JSON,
-  headers: r = null
-}) => {
-  window.postMessage({
-    type: "getResponseWithoutCors",
-    data: {
-      url: t,
-      method: e,
-      data: a,
-      requestKey: n,
-      requestType: s,
-      headers: r
-    }
-  });
-};
-class C {
-  registerOnCallIncoming(e) {
-    e();
-  }
-  registerOnCallConnected(e) {
-    e();
-  }
-  registerOnCallDisconnected(e) {
-    e();
-  }
-  acceptCall() {
-  }
-  rejectCall() {
-  }
-  muteCall() {
-  }
-  unmuteCall() {
-  }
-  setOnBreak() {
-  }
-  setAvailable() {
-  }
-}
-export {
-  C as IAdapter,
-  l as RequestType,
-  o as getResponseWithoutCors
-};
+
diff --git a/packages/common/dist/main.d.ts b/packages/common/dist/main.d.ts
new file mode 100644
index 0000000..cb0ff5c
--- /dev/null
+++ b/packages/common/dist/main.d.ts
@@ -0,0 +1 @@
+export {};
diff --git a/packages/common/dist/utils/getResponseWithoutCors.d.ts b/packages/common/dist/utils/getResponseWithoutCors.d.ts
index 748fa90..c4e7d2e 100644
--- a/packages/common/dist/utils/getResponseWithoutCors.d.ts
+++ b/packages/common/dist/utils/getResponseWithoutCors.d.ts
@@ -1,12 +1,11 @@
 import { default as RequestType } from '../types/RequestType.ts';
-import { default as GenericObject } from '../types/GenericObject.ts';
 type GetResponseWithoutCors = {
     url: string;
     method: string;
-    data?: GenericObject | string;
+    data?: Record<string, any> | string;
     requestKey: string;
     requestType?: RequestType;
-    headers?: GenericObject | null;
+    headers?: Record<string, any> | null;
 };
 export declare const getResponseWithoutCors: ({ url, method, data, requestKey, requestType, headers }: GetResponseWithoutCors) => void;
 export default getResponseWithoutCors;
diff --git a/packages/common/Interfaces/IAdapter.js b/packages/common/lib/Interfaces/IAdapter.js
similarity index 100%
rename from packages/common/Interfaces/IAdapter.js
rename to packages/common/lib/Interfaces/IAdapter.js
diff --git a/packages/common/Interfaces/IAdapter.ts b/packages/common/lib/Interfaces/IAdapter.ts
similarity index 100%
rename from packages/common/Interfaces/IAdapter.ts
rename to packages/common/lib/Interfaces/IAdapter.ts
diff --git a/packages/common/lib/common.js b/packages/common/lib/common.js
deleted file mode 100644
index 2b2e7fe..0000000
--- a/packages/common/lib/common.js
+++ /dev/null
@@ -1,7 +0,0 @@
-'use strict';
-
-module.exports = common;
-
-function common() {
-  return 'Hello from common';
-}
diff --git a/packages/common/lib/main.ts b/packages/common/lib/main.ts
index 9323891..98116b8 100644
--- a/packages/common/lib/main.ts
+++ b/packages/common/lib/main.ts
@@ -1,13 +1,13 @@
-import getResponseWithoutCors   from "../utils/getResponseWithoutCors.ts"
-import GenericObject from  "../../common/types/GenericObject.ts";
-import RequestType from "../../common/types/RequestType.ts";
-import IAdapter from "../Interfaces/IAdapter.ts";
-
-
-
-export {
-    getResponseWithoutCors,
-    type GenericObject,
-    RequestType,
-    IAdapter
-}
\ No newline at end of file
+// import getResponseWithoutCors   from "./utils/getResponseWithoutCors"
+// import GenericObject from "./types/GenericObject";
+// import RequestType from "./types/RequestType";
+// import IAdapter from "./Interfaces/IAdapter";
+//
+//
+//
+// export {
+//     getResponseWithoutCors,
+//     type GenericObject,
+//     RequestType,
+//     IAdapter
+// }
\ No newline at end of file
diff --git a/packages/common/types/GenericObject.js b/packages/common/lib/types/GenericObject.js
similarity index 100%
rename from packages/common/types/GenericObject.js
rename to packages/common/lib/types/GenericObject.js
diff --git a/packages/common/types/GenericObject.ts b/packages/common/lib/types/GenericObject.ts
similarity index 100%
rename from packages/common/types/GenericObject.ts
rename to packages/common/lib/types/GenericObject.ts
diff --git a/packages/common/types/RequestType.js b/packages/common/lib/types/RequestType.js
similarity index 100%
rename from packages/common/types/RequestType.js
rename to packages/common/lib/types/RequestType.js
diff --git a/packages/common/types/RequestType.ts b/packages/common/lib/types/RequestType.ts
similarity index 100%
rename from packages/common/types/RequestType.ts
rename to packages/common/lib/types/RequestType.ts
diff --git a/packages/common/utils/getResponseWithoutCors.js b/packages/common/lib/utils/getResponseWithoutCors.js
similarity index 90%
rename from packages/common/utils/getResponseWithoutCors.js
rename to packages/common/lib/utils/getResponseWithoutCors.js
index 0ccccb1..86340a2 100644
--- a/packages/common/utils/getResponseWithoutCors.js
+++ b/packages/common/lib/utils/getResponseWithoutCors.js
@@ -2,7 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getResponseWithoutCors = void 0;
 var RequestType_1 = require("../types/RequestType.js");
-var MessagingType_1 = require("../../adapter-ameyo/types/MessagingType");
+var MessagingType_1 = require("@universal-call-sdk/adapter-ameyo/types/MessagingType.js");
 var getResponseWithoutCors = function (_a) {
     var url = _a.url, method = _a.method, _b = _a.data, data = _b === void 0 ? {} : _b, requestKey = _a.requestKey, _c = _a.requestType, requestType = _c === void 0 ? RequestType_1.default.JSON : _c, _d = _a.headers, headers = _d === void 0 ? null : _d;
     window.postMessage({
diff --git a/packages/common/utils/getResponseWithoutCors.ts b/packages/common/lib/utils/getResponseWithoutCors.ts
similarity index 82%
rename from packages/common/utils/getResponseWithoutCors.ts
rename to packages/common/lib/utils/getResponseWithoutCors.ts
index e4ba9b8..b3eef43 100644
--- a/packages/common/utils/getResponseWithoutCors.ts
+++ b/packages/common/lib/utils/getResponseWithoutCors.ts
@@ -1,5 +1,4 @@
 import RequestType from "../types/RequestType.ts";
-import GenericObject from "../types/GenericObject.ts";
 
 enum MessagingType {
     GET_RESPONSE_WITHOUT_CORS = 'getResponseWithoutCors',
@@ -10,10 +9,10 @@ enum MessagingType {
 type GetResponseWithoutCors = {
     url: string;
     method: string;
-    data ? : GenericObject | string;
+    data ?:Record<string, any> | string;
     requestKey: string;
-    requestType ? : RequestType;
-    headers ? : GenericObject | null;
+    requestType ?: RequestType;
+    headers ?: Record<string, any> | null;
 }
 
 export const getResponseWithoutCors = ({
diff --git a/packages/common/package.json b/packages/common/package.json
index 966bd76..4180ede 100644
--- a/packages/common/package.json
+++ b/packages/common/package.json
@@ -2,7 +2,6 @@
   "name": "@universal-call-sdk/common",
   "version": "1.0.4",
   "type": "module",
-  "main": "dist/index.js",
   "scripts": {
     "dev": "vite",
     "build": "tsc  --p ./tsconfig.build.json  && vite build",
diff --git a/packages/common/tsconfig.app.json b/packages/common/tsconfig.app.json
index 8e19d75..c95ece4 100644
--- a/packages/common/tsconfig.app.json
+++ b/packages/common/tsconfig.app.json
@@ -20,5 +20,5 @@
     "noUnusedParameters": true,
     "noFallthroughCasesInSwitch": true
   },
-  "include": ["src", "lib"]
+  "include": ["lib"]
 }
diff --git a/packages/common/tsconfig.build.json b/packages/common/tsconfig.build.json
index ca5c118..c256002 100644
--- a/packages/common/tsconfig.build.json
+++ b/packages/common/tsconfig.build.json
@@ -1,8 +1,4 @@
 {
   "extends": "./tsconfig.app.json",
-  "include": [
-    "Interfaces",
-    "types",
-    "utils"
-  ]
+  "include":["lib"]
 }
\ No newline at end of file