diff --git a/README.md b/README.md
index 6b1fc9436..20a4b3ee1 100644
--- a/README.md
+++ b/README.md
@@ -124,7 +124,7 @@ We're currently setting the foundation and building [integrations](https://infis
     </tr>
     <tr>
       <td align="left" valign="middle">
-        🔜 Vercel
+        🔜 Vercel (https://github.com/Infisical/infisical/issues/60)
       </td>
       <td align="left" valign="middle">
         🔜 GitLab CI/CD
diff --git a/frontend/.eslintrc.json b/frontend/.eslintrc.json
index 0c5504b90..fc0c07a74 100644
--- a/frontend/.eslintrc.json
+++ b/frontend/.eslintrc.json
@@ -1,8 +1,6 @@
 {
-  "extends": "next/core-web-vitals",
-  "plugins": [
-    "simple-import-sort"
-  ],
+  "extends": ["next/babel", "next/core-web-vitals"],
+  "plugins": ["simple-import-sort"],
   "rules": {
     "react-hooks/exhaustive-deps": "off",
     "simple-import-sort/exports": "warn",
@@ -18,15 +16,9 @@
             "^(assert|buffer|child_process|cluster|console|constants|crypto|dgram|dns|domain|events|fs|http|https|module|net|os|path|punycode|querystring|readline|repl|stream|string_decoder|sys|timers|tls|tty|url|util|vm|zlib|freelist|v8|process|async_hooks|http2|perf_hooks)(/.*|$)"
           ],
           // Packages `react` related packages
-          [
-            "^react",
-            "^next",
-            "^@?\\w"
-          ],
+          ["^react", "^next", "^@?\\w"],
           // Internal packages.
-          [
-            "^~(/.*|$)"
-          ],
+          ["^~(/.*|$)"],
           // Relative imports
           [
             "^\\.\\.(?!/?$)",
@@ -36,11 +28,9 @@
             "^\\./?$"
           ],
           // Style imports.
-          [
-            "^.+\\.?(css|scss)$"
-          ]
+          ["^.+\\.?(css|scss)$"]
         ]
       }
     ]
   }
-}
\ No newline at end of file
+}
diff --git a/frontend/README.md b/frontend/README.md
index b33ff4335..d97bb4bef 100644
--- a/frontend/README.md
+++ b/frontend/README.md
@@ -1,20 +1,22 @@
 This is the client repository for Infisical.
 
-## Before you get started with development locally 
+## Before you get started with development locally
+
 Please ensure you have Docker and Docker Compose installed for your OS.
 
-### Steps to start server 
+### Steps to start server
+
 - `CD` into the repo
 - run command `docker-compose -f docker-compose.dev.yml up --build --force-recreate`
-- Vist localhost:3000 and the website should be live 
+- Visit localhost:3000 and the website should be live
+
+### Steps to shutdown this Docker compose
 
-### Steps to shutdown this Docker compose 
 - `CD` into this repo
-- run command `docker-compose -f docker-compose-dev.yml  down`
+- run command `docker-compose -f docker-compose.dev.yml down`
 
 ### Notes
-Any changes made to local files in the `/components`, `/pages`, `styles` will be hot reloaded. If would like like to watch for other files or folders live, please add them to the docker volume. 
+
+Any changes made to local files in the `/components`, `/pages`, `/styles` will be hot reloaded. If would like like to watch for other files or folders live, please add them to the docker volume.
 
 You will also need to ensure that a .env.local file exists with all required environment variables
-
-
diff --git a/charts/infisical/.helmignore b/helm-charts/infisical/.helmignore
similarity index 100%
rename from charts/infisical/.helmignore
rename to helm-charts/infisical/.helmignore
diff --git a/charts/infisical/Chart.yaml b/helm-charts/infisical/Chart.yaml
similarity index 100%
rename from charts/infisical/Chart.yaml
rename to helm-charts/infisical/Chart.yaml
diff --git a/charts/infisical/templates/NOTES.txt b/helm-charts/infisical/templates/NOTES.txt
similarity index 100%
rename from charts/infisical/templates/NOTES.txt
rename to helm-charts/infisical/templates/NOTES.txt
diff --git a/charts/infisical/templates/_helpers.tpl b/helm-charts/infisical/templates/_helpers.tpl
similarity index 100%
rename from charts/infisical/templates/_helpers.tpl
rename to helm-charts/infisical/templates/_helpers.tpl
diff --git a/charts/infisical/templates/deployment.yaml b/helm-charts/infisical/templates/deployment.yaml
similarity index 100%
rename from charts/infisical/templates/deployment.yaml
rename to helm-charts/infisical/templates/deployment.yaml
diff --git a/charts/infisical/templates/ingress.yaml b/helm-charts/infisical/templates/ingress.yaml
similarity index 100%
rename from charts/infisical/templates/ingress.yaml
rename to helm-charts/infisical/templates/ingress.yaml
diff --git a/charts/infisical/templates/tests/test-connection.yaml b/helm-charts/infisical/templates/tests/test-connection.yaml
similarity index 100%
rename from charts/infisical/templates/tests/test-connection.yaml
rename to helm-charts/infisical/templates/tests/test-connection.yaml
diff --git a/charts/infisical/values.yaml b/helm-charts/infisical/values.yaml
similarity index 100%
rename from charts/infisical/values.yaml
rename to helm-charts/infisical/values.yaml