diff --git a/.gitignore b/.gitignore
index 1f28034..e935ebe 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,7 +2,8 @@
 .env
 build 
 storybook-static
-environments/.dev.preview-server.env
+envs/client/.dev.preview-server.env
+envs/server
 # See https://help.github.com/articles/ignoring-files/ for more about ignoring files.
 
 # dependencies
diff --git a/environments/.preview.env b/environments/.preview.env
deleted file mode 100644
index e69de29..0000000
diff --git a/environments/.prod.github.env b/environments/.prod.github.env
deleted file mode 100644
index 94cbdea..0000000
--- a/environments/.prod.github.env
+++ /dev/null
@@ -1,2 +0,0 @@
-REACT_APP_FOR_GITHUB=true
-REACT_APP_API_END_POINT = https://makers.bolt.fun/.netlify/functions 
\ No newline at end of file
diff --git a/environments/.dev.mock-server.env b/envs/client/.dev.mock-server.env
similarity index 100%
rename from environments/.dev.mock-server.env
rename to envs/client/.dev.mock-server.env
diff --git a/environments/.dev.prod-server.env b/envs/client/.dev.prod-server.env
similarity index 100%
rename from environments/.dev.prod-server.env
rename to envs/client/.dev.prod-server.env
diff --git a/environments/.dev.server.env b/envs/client/.dev.server.env
similarity index 100%
rename from environments/.dev.server.env
rename to envs/client/.dev.server.env
diff --git a/environments/.prod.mock-server.env b/envs/client/.prod.mock-server.env
similarity index 100%
rename from environments/.prod.mock-server.env
rename to envs/client/.prod.mock-server.env
diff --git a/package.json b/package.json
index 8153971..6f8dfe6 100644
--- a/package.json
+++ b/package.json
@@ -90,23 +90,22 @@
     "yup": "^0.32.11"
   },
   "scripts": {
-    "client:prod-server": "env-cmd -f ./environments/.dev.prod-server.env react-scripts start",
-    "client:preview-server": "env-cmd -f ./environments/.dev.preview-server.env react-scripts start",
-    "client:mocks": "env-cmd -f ./environments/.dev.mock-server.env react-scripts start",
-    "client:dev-server": "env-cmd -f ./environments/.dev.server.env react-scripts start",
-    "server:dev": "serverless offline",
+    "client:prod-server": "env-cmd -f ./envs/client/.dev.prod-server.env react-scripts start",
+    "client:preview-server": "env-cmd -f ./envs/client/.dev.preview-server.env react-scripts start",
+    "client:mocks": "env-cmd -f ./envs/client/.dev.mock-server.env react-scripts start",
+    "client:dev-server": "env-cmd -f ./envs/client/.dev.server.env react-scripts start",
+    "server:dev": "env-cmd -f ./envs/server/local.env  serverless offline",
+    "server:preview": "env-cmd -f ./envs/server/preview.env  serverless offline",
+    "server:prod": "env-cmd -f ./envs/server/prod.env  serverless offline",
     "generate-graphql": "graphql-codegen",
+    "storybook": "env-cmd -f ./envs/client/.dev.preview-server.env start-storybook -p 6006 -s public",
+    "storybook:mocks": "env-cmd -f ./envs/client/.dev.mock-server.env start-storybook -p 6006 -s public",
     "build": "react-scripts build",
-    "build:mocks": "env-cmd -f ./environments/.prod.mock-server.env react-scripts build",
+    "build:mocks": "env-cmd -f ./envs/client/.prod.mock-server.env react-scripts build",
+    "build-storybook": "env-cmd -f ./envs/client/.dev.preview-server.env build-storybook -s public",
+    "build-storybook:mocks": "env-cmd -f ./envs/client/.prod.mock-server.env build-storybook -s public",
     "test": "react-scripts test",
     "eject": "react-scripts eject",
-    "predeploy": "env-cmd -f ./environments/.prod.github.env npm run build",
-    "deploy": "gh-pages -d build",
-    "only-deploy": "gh-pages -d build",
-    "storybook": "env-cmd -f ./environments/.dev.preview-server.env start-storybook -p 6006 -s public",
-    "storybook:mocks": "env-cmd -f ./environments/.dev.mock-server.env start-storybook -p 6006 -s public",
-    "build-storybook": "env-cmd -f ./environments/.prod.preview-server.env build-storybook -s public",
-    "build-storybook:mocks": "env-cmd -f ./environments/.prod.mock-server.env build-storybook -s public",
     "db:migrate-dev": "prisma migrate dev",
     "db:migrate-deploy": "prisma migrate deploy",
     "db:reset": "prisma migrate reset",
diff --git a/src/utils/hooks/useResizeListener.ts b/src/utils/hooks/useResizeListener.ts
index 356e1a9..9173b14 100644
--- a/src/utils/hooks/useResizeListener.ts
+++ b/src/utils/hooks/useResizeListener.ts
@@ -1,5 +1,5 @@
 import { useDebouncedCallback } from "@react-hookz/web";
-import { useCallback, useEffect } from "react";
+import { useEffect } from "react";
 
 export const useResizeListener = (
   listener: () => void,