diff --git a/package.json b/package.json
index 0d48b8f..ac514fa 100644
--- a/package.json
+++ b/package.json
@@ -116,10 +116,15 @@
       "import": "./handlers/next/index.mjs",
       "require": "./handlers/next/index.js"
     },
-    ".": {
-      "types": "./index.d.ts",
-      "import": "./index.mjs",
-      "require": "./index.js"
+    "./saleor-app": {
+      "types": "./saleor-app.d.ts",
+      "import": "./saleor-app.mjs",
+      "require": "./saleor-app.js"
+    },
+    "./infer-webhooks": {
+      "types": "./infer-webhooks.d.ts",
+      "import": "./infer-webhooks.mjs",
+      "require": "./infer-webhooks.js"
     }
   },
   "publishConfig": {
diff --git a/tsup.config.ts b/tsup.config.ts
index a457961..1eb74be 100644
--- a/tsup.config.ts
+++ b/tsup.config.ts
@@ -2,11 +2,12 @@ import { defineConfig } from "tsup";
 
 export default defineConfig({
   entry: [
-    /**
-     * TODO Introduce breaking change and remove exporting from paths, merge everything to index
-     */
-    "src/*",
-    "src/index.ts",
+    "src/const.ts",
+    "src/types.ts",
+    "src/urls.ts",
+    "src/headers.ts",
+    "src/saleor-app.ts",
+    "src/infer-webhooks.ts",
     "src/APL/index.ts",
     "src/app-bridge/index.ts",
     "src/handlers/next/index.ts",