diff --git a/apps/remixdocgen/.eslintrc.json b/apps/doc-gen/.eslintrc.json
similarity index 100%
rename from apps/remixdocgen/.eslintrc.json
rename to apps/doc-gen/.eslintrc.json
diff --git a/apps/remixdocgen/.prettierrc b/apps/doc-gen/.prettierrc
similarity index 100%
rename from apps/remixdocgen/.prettierrc
rename to apps/doc-gen/.prettierrc
diff --git a/apps/remixdocgen/project.json b/apps/doc-gen/project.json
similarity index 57%
rename from apps/remixdocgen/project.json
rename to apps/doc-gen/project.json
index b214647ecc..51d9d63212 100644
--- a/apps/remixdocgen/project.json
+++ b/apps/doc-gen/project.json
@@ -1,7 +1,7 @@
 {
-  "name": "remixdocgen",
+  "name": "doc-gen",
   "$schema": "../../node_modules/nx/schemas/project-schema.json",
-  "sourceRoot": "apps/remixdocgen/src",
+  "sourceRoot": "apps/doc-gen/src",
   "projectType": "application",
   "implicitDependencies": [
   ],
@@ -12,17 +12,17 @@
       "defaultConfiguration": "development",
       "options": {
         "compiler": "babel",
-        "outputPath": "dist/apps/remixdocgen",
-        "index": "apps/remixdocgen/src/index.html",
+        "outputPath": "dist/apps/doc-gen",
+        "index": "apps/doc-gen/src/index.html",
         "baseHref": "/",
-        "main": "apps/remixdocgen/src/main.tsx",
-        "tsConfig": "apps/remixdocgen/tsconfig.app.json",
+        "main": "apps/doc-gen/src/main.tsx",
+        "tsConfig": "apps/doc-gen/tsconfig.app.json",
         "assets": [
-          "apps/remixdocgen/src/favicon.ico"
+          "apps/doc-gen/src/favicon.ico"
         ],
         "styles": [],
         "scripts": [],
-        "webpackConfig": "apps/remixdocgen/webpack.config.js"
+        "webpackConfig": "apps/doc-gen/webpack.config.js"
       },
       "configurations": {
         "development": {
@@ -30,8 +30,8 @@
         "production": {
           "fileReplacements": [
             {
-              "replace": "apps/remixdocgen/src/environments/environment.ts",
-              "with": "apps/remixdocgen/src/environments/environment.prod.ts"
+              "replace": "apps/doc-gen/src/environments/environment.ts",
+              "with": "apps/doc-gen/src/environments/environment.prod.ts"
             }
           ]
         }
@@ -41,16 +41,16 @@
       "executor": "@nrwl/webpack:dev-server",
       "defaultConfiguration": "development",
       "options": {
-        "buildTarget": "remixdocgen:build",
+        "buildTarget": "doc-gen:build",
         "hmr": true
       },
       "configurations": {
         "development": {
-          "buildTarget": "remixdocgen:build:development",
+          "buildTarget": "doc-gen:build:development",
           "port": 6003
         },
         "production": {
-          "buildTarget": "remixdocgen:build:production"
+          "buildTarget": "doc-gen:build:production"
         }
       }
     }
diff --git a/apps/remixdocgen/src/app/App.css b/apps/doc-gen/src/app/App.css
similarity index 100%
rename from apps/remixdocgen/src/app/App.css
rename to apps/doc-gen/src/app/App.css
diff --git a/apps/remixdocgen/src/app/App.tsx b/apps/doc-gen/src/app/App.tsx
similarity index 80%
rename from apps/remixdocgen/src/app/App.tsx
rename to apps/doc-gen/src/app/App.tsx
index e118913210..010f2dec30 100644
--- a/apps/remixdocgen/src/app/App.tsx
+++ b/apps/doc-gen/src/app/App.tsx
@@ -31,11 +31,11 @@ const App = () => {
   }, [])
 
   return (
-    <div>
+    <div className="p-3">
       <h1>Remix Docgen</h1>
       {fileName && <h4>File: {fileName.split('/')[1].split('.')[0].concat('.sol')}</h4>}
-      {hasBuild && <button className="btn btn-primary mr-3 ml-3 rounded" onClick={() => client.generateDocs()}>Generate doc</button>}
-      {hasBuild && <button className="btn btn-primary mr-3 ml-3 rounded" onClick={() => client.opendDocs(client.docs)}>Open docs</button>}
+      {hasBuild && <button className="btn btn-primary btn-block mt-4 rounded" onClick={() => client.generateDocs()}>Generate doc</button>}
+
     </div>
   )
 };
diff --git a/apps/remixdocgen/src/app/docgen-client.ts b/apps/doc-gen/src/app/docgen-client.ts
similarity index 100%
rename from apps/remixdocgen/src/app/docgen-client.ts
rename to apps/doc-gen/src/app/docgen-client.ts
diff --git a/apps/remixdocgen/src/app/docgen/common/helpers.ts b/apps/doc-gen/src/app/docgen/common/helpers.ts
similarity index 100%
rename from apps/remixdocgen/src/app/docgen/common/helpers.ts
rename to apps/doc-gen/src/app/docgen/common/helpers.ts
diff --git a/apps/remixdocgen/src/app/docgen/common/properties.ts b/apps/doc-gen/src/app/docgen/common/properties.ts
similarity index 100%
rename from apps/remixdocgen/src/app/docgen/common/properties.ts
rename to apps/doc-gen/src/app/docgen/common/properties.ts
diff --git a/apps/remixdocgen/src/app/docgen/config.ts b/apps/doc-gen/src/app/docgen/config.ts
similarity index 100%
rename from apps/remixdocgen/src/app/docgen/config.ts
rename to apps/doc-gen/src/app/docgen/config.ts
diff --git a/apps/remixdocgen/src/app/docgen/doc-item.ts b/apps/doc-gen/src/app/docgen/doc-item.ts
similarity index 100%
rename from apps/remixdocgen/src/app/docgen/doc-item.ts
rename to apps/doc-gen/src/app/docgen/doc-item.ts
diff --git a/apps/remixdocgen/src/app/docgen/render.ts b/apps/doc-gen/src/app/docgen/render.ts
similarity index 100%
rename from apps/remixdocgen/src/app/docgen/render.ts
rename to apps/doc-gen/src/app/docgen/render.ts
diff --git a/apps/remixdocgen/src/app/docgen/site.ts b/apps/doc-gen/src/app/docgen/site.ts
similarity index 100%
rename from apps/remixdocgen/src/app/docgen/site.ts
rename to apps/doc-gen/src/app/docgen/site.ts
diff --git a/apps/remixdocgen/src/app/docgen/templates.ts b/apps/doc-gen/src/app/docgen/templates.ts
similarity index 100%
rename from apps/remixdocgen/src/app/docgen/templates.ts
rename to apps/doc-gen/src/app/docgen/templates.ts
diff --git a/apps/remixdocgen/src/app/docgen/themes/markdown/common.hbs b/apps/doc-gen/src/app/docgen/themes/markdown/common.hbs
similarity index 100%
rename from apps/remixdocgen/src/app/docgen/themes/markdown/common.hbs
rename to apps/doc-gen/src/app/docgen/themes/markdown/common.hbs
diff --git a/apps/remixdocgen/src/app/docgen/themes/markdown/contract.hbs b/apps/doc-gen/src/app/docgen/themes/markdown/contract.hbs
similarity index 100%
rename from apps/remixdocgen/src/app/docgen/themes/markdown/contract.hbs
rename to apps/doc-gen/src/app/docgen/themes/markdown/contract.hbs
diff --git a/apps/remixdocgen/src/app/docgen/themes/markdown/enum.hbs b/apps/doc-gen/src/app/docgen/themes/markdown/enum.hbs
similarity index 100%
rename from apps/remixdocgen/src/app/docgen/themes/markdown/enum.hbs
rename to apps/doc-gen/src/app/docgen/themes/markdown/enum.hbs
diff --git a/apps/remixdocgen/src/app/docgen/themes/markdown/error.hbs b/apps/doc-gen/src/app/docgen/themes/markdown/error.hbs
similarity index 100%
rename from apps/remixdocgen/src/app/docgen/themes/markdown/error.hbs
rename to apps/doc-gen/src/app/docgen/themes/markdown/error.hbs
diff --git a/apps/remixdocgen/src/app/docgen/themes/markdown/event.hbs b/apps/doc-gen/src/app/docgen/themes/markdown/event.hbs
similarity index 100%
rename from apps/remixdocgen/src/app/docgen/themes/markdown/event.hbs
rename to apps/doc-gen/src/app/docgen/themes/markdown/event.hbs
diff --git a/apps/remixdocgen/src/app/docgen/themes/markdown/function.hbs b/apps/doc-gen/src/app/docgen/themes/markdown/function.hbs
similarity index 100%
rename from apps/remixdocgen/src/app/docgen/themes/markdown/function.hbs
rename to apps/doc-gen/src/app/docgen/themes/markdown/function.hbs
diff --git a/apps/remixdocgen/src/app/docgen/themes/markdown/helpers.ts b/apps/doc-gen/src/app/docgen/themes/markdown/helpers.ts
similarity index 100%
rename from apps/remixdocgen/src/app/docgen/themes/markdown/helpers.ts
rename to apps/doc-gen/src/app/docgen/themes/markdown/helpers.ts
diff --git a/apps/remixdocgen/src/app/docgen/themes/markdown/modifier.hbs b/apps/doc-gen/src/app/docgen/themes/markdown/modifier.hbs
similarity index 100%
rename from apps/remixdocgen/src/app/docgen/themes/markdown/modifier.hbs
rename to apps/doc-gen/src/app/docgen/themes/markdown/modifier.hbs
diff --git a/apps/remixdocgen/src/app/docgen/themes/markdown/page.hbs b/apps/doc-gen/src/app/docgen/themes/markdown/page.hbs
similarity index 100%
rename from apps/remixdocgen/src/app/docgen/themes/markdown/page.hbs
rename to apps/doc-gen/src/app/docgen/themes/markdown/page.hbs
diff --git a/apps/remixdocgen/src/app/docgen/themes/markdown/struct.hbs b/apps/doc-gen/src/app/docgen/themes/markdown/struct.hbs
similarity index 100%
rename from apps/remixdocgen/src/app/docgen/themes/markdown/struct.hbs
rename to apps/doc-gen/src/app/docgen/themes/markdown/struct.hbs
diff --git a/apps/remixdocgen/src/app/docgen/themes/markdown/user-defined-value-type.hbs b/apps/doc-gen/src/app/docgen/themes/markdown/user-defined-value-type.hbs
similarity index 100%
rename from apps/remixdocgen/src/app/docgen/themes/markdown/user-defined-value-type.hbs
rename to apps/doc-gen/src/app/docgen/themes/markdown/user-defined-value-type.hbs
diff --git a/apps/remixdocgen/src/app/docgen/themes/markdown/variable.hbs b/apps/doc-gen/src/app/docgen/themes/markdown/variable.hbs
similarity index 100%
rename from apps/remixdocgen/src/app/docgen/themes/markdown/variable.hbs
rename to apps/doc-gen/src/app/docgen/themes/markdown/variable.hbs
diff --git a/apps/remixdocgen/src/app/docgen/utils/ItemError.ts b/apps/doc-gen/src/app/docgen/utils/ItemError.ts
similarity index 100%
rename from apps/remixdocgen/src/app/docgen/utils/ItemError.ts
rename to apps/doc-gen/src/app/docgen/utils/ItemError.ts
diff --git a/apps/remixdocgen/src/app/docgen/utils/arrays-equal.ts b/apps/doc-gen/src/app/docgen/utils/arrays-equal.ts
similarity index 100%
rename from apps/remixdocgen/src/app/docgen/utils/arrays-equal.ts
rename to apps/doc-gen/src/app/docgen/utils/arrays-equal.ts
diff --git a/apps/remixdocgen/src/app/docgen/utils/assert-equal-types.ts b/apps/doc-gen/src/app/docgen/utils/assert-equal-types.ts
similarity index 100%
rename from apps/remixdocgen/src/app/docgen/utils/assert-equal-types.ts
rename to apps/doc-gen/src/app/docgen/utils/assert-equal-types.ts
diff --git a/apps/remixdocgen/src/app/docgen/utils/clone.ts b/apps/doc-gen/src/app/docgen/utils/clone.ts
similarity index 100%
rename from apps/remixdocgen/src/app/docgen/utils/clone.ts
rename to apps/doc-gen/src/app/docgen/utils/clone.ts
diff --git a/apps/remixdocgen/src/app/docgen/utils/ensure-array.ts b/apps/doc-gen/src/app/docgen/utils/ensure-array.ts
similarity index 100%
rename from apps/remixdocgen/src/app/docgen/utils/ensure-array.ts
rename to apps/doc-gen/src/app/docgen/utils/ensure-array.ts
diff --git a/apps/remixdocgen/src/app/docgen/utils/execall.ts b/apps/doc-gen/src/app/docgen/utils/execall.ts
similarity index 100%
rename from apps/remixdocgen/src/app/docgen/utils/execall.ts
rename to apps/doc-gen/src/app/docgen/utils/execall.ts
diff --git a/apps/remixdocgen/src/app/docgen/utils/is-child.ts b/apps/doc-gen/src/app/docgen/utils/is-child.ts
similarity index 100%
rename from apps/remixdocgen/src/app/docgen/utils/is-child.ts
rename to apps/doc-gen/src/app/docgen/utils/is-child.ts
diff --git a/apps/remixdocgen/src/app/docgen/utils/item-type.ts b/apps/doc-gen/src/app/docgen/utils/item-type.ts
similarity index 100%
rename from apps/remixdocgen/src/app/docgen/utils/item-type.ts
rename to apps/doc-gen/src/app/docgen/utils/item-type.ts
diff --git a/apps/remixdocgen/src/app/docgen/utils/map-keys.ts b/apps/doc-gen/src/app/docgen/utils/map-keys.ts
similarity index 100%
rename from apps/remixdocgen/src/app/docgen/utils/map-keys.ts
rename to apps/doc-gen/src/app/docgen/utils/map-keys.ts
diff --git a/apps/remixdocgen/src/app/docgen/utils/map-values.ts b/apps/doc-gen/src/app/docgen/utils/map-values.ts
similarity index 100%
rename from apps/remixdocgen/src/app/docgen/utils/map-values.ts
rename to apps/doc-gen/src/app/docgen/utils/map-values.ts
diff --git a/apps/remixdocgen/src/app/docgen/utils/memoized-getter.ts b/apps/doc-gen/src/app/docgen/utils/memoized-getter.ts
similarity index 100%
rename from apps/remixdocgen/src/app/docgen/utils/memoized-getter.ts
rename to apps/doc-gen/src/app/docgen/utils/memoized-getter.ts
diff --git a/apps/remixdocgen/src/app/docgen/utils/natspec.ts b/apps/doc-gen/src/app/docgen/utils/natspec.ts
similarity index 100%
rename from apps/remixdocgen/src/app/docgen/utils/natspec.ts
rename to apps/doc-gen/src/app/docgen/utils/natspec.ts
diff --git a/apps/remixdocgen/src/app/docgen/utils/read-item-docs.ts b/apps/doc-gen/src/app/docgen/utils/read-item-docs.ts
similarity index 100%
rename from apps/remixdocgen/src/app/docgen/utils/read-item-docs.ts
rename to apps/doc-gen/src/app/docgen/utils/read-item-docs.ts
diff --git a/apps/remixdocgen/src/app/docgen/utils/scope.ts b/apps/doc-gen/src/app/docgen/utils/scope.ts
similarity index 100%
rename from apps/remixdocgen/src/app/docgen/utils/scope.ts
rename to apps/doc-gen/src/app/docgen/utils/scope.ts
diff --git a/apps/remixdocgen/src/app/hooks/useLocalStorage.tsx b/apps/doc-gen/src/app/hooks/useLocalStorage.tsx
similarity index 100%
rename from apps/remixdocgen/src/app/hooks/useLocalStorage.tsx
rename to apps/doc-gen/src/app/hooks/useLocalStorage.tsx
diff --git a/apps/remixdocgen/src/app/views/ErrorView.tsx b/apps/doc-gen/src/app/views/ErrorView.tsx
similarity index 100%
rename from apps/remixdocgen/src/app/views/ErrorView.tsx
rename to apps/doc-gen/src/app/views/ErrorView.tsx
diff --git a/apps/remixdocgen/src/app/views/index.ts b/apps/doc-gen/src/app/views/index.ts
similarity index 100%
rename from apps/remixdocgen/src/app/views/index.ts
rename to apps/doc-gen/src/app/views/index.ts
diff --git a/apps/docviewer/src/favicon.ico b/apps/doc-gen/src/favicon.ico
similarity index 100%
rename from apps/docviewer/src/favicon.ico
rename to apps/doc-gen/src/favicon.ico
diff --git a/apps/remixdocgen/src/index.html b/apps/doc-gen/src/index.html
similarity index 100%
rename from apps/remixdocgen/src/index.html
rename to apps/doc-gen/src/index.html
diff --git a/apps/remixdocgen/src/main.tsx b/apps/doc-gen/src/main.tsx
similarity index 100%
rename from apps/remixdocgen/src/main.tsx
rename to apps/doc-gen/src/main.tsx
diff --git a/apps/remixdocgen/src/types.ts b/apps/doc-gen/src/types.ts
similarity index 100%
rename from apps/remixdocgen/src/types.ts
rename to apps/doc-gen/src/types.ts
diff --git a/apps/docviewer/tsconfig.app.json b/apps/doc-gen/tsconfig.app.json
similarity index 100%
rename from apps/docviewer/tsconfig.app.json
rename to apps/doc-gen/tsconfig.app.json
diff --git a/apps/docviewer/tsconfig.json b/apps/doc-gen/tsconfig.json
similarity index 100%
rename from apps/docviewer/tsconfig.json
rename to apps/doc-gen/tsconfig.json
diff --git a/apps/docviewer/webpack.config.js b/apps/doc-gen/webpack.config.js
similarity index 100%
rename from apps/docviewer/webpack.config.js
rename to apps/doc-gen/webpack.config.js
diff --git a/apps/docviewer/project.json b/apps/doc-viewer/project.json
similarity index 100%
rename from apps/docviewer/project.json
rename to apps/doc-viewer/project.json
diff --git a/apps/docviewer/src/app/App.tsx b/apps/doc-viewer/src/app/App.tsx
similarity index 100%
rename from apps/docviewer/src/app/App.tsx
rename to apps/doc-viewer/src/app/App.tsx
diff --git a/apps/docviewer/src/app/docviewer.ts b/apps/doc-viewer/src/app/docviewer.ts
similarity index 100%
rename from apps/docviewer/src/app/docviewer.ts
rename to apps/doc-viewer/src/app/docviewer.ts
diff --git a/apps/remixdocgen/src/favicon.ico b/apps/doc-viewer/src/favicon.ico
similarity index 100%
rename from apps/remixdocgen/src/favicon.ico
rename to apps/doc-viewer/src/favicon.ico
diff --git a/apps/docviewer/src/index.html b/apps/doc-viewer/src/index.html
similarity index 100%
rename from apps/docviewer/src/index.html
rename to apps/doc-viewer/src/index.html
diff --git a/apps/docviewer/src/main.tsx b/apps/doc-viewer/src/main.tsx
similarity index 100%
rename from apps/docviewer/src/main.tsx
rename to apps/doc-viewer/src/main.tsx
diff --git a/apps/remixdocgen/tsconfig.app.json b/apps/doc-viewer/tsconfig.app.json
similarity index 100%
rename from apps/remixdocgen/tsconfig.app.json
rename to apps/doc-viewer/tsconfig.app.json
diff --git a/apps/remixdocgen/tsconfig.json b/apps/doc-viewer/tsconfig.json
similarity index 100%
rename from apps/remixdocgen/tsconfig.json
rename to apps/doc-viewer/tsconfig.json
diff --git a/apps/remixdocgen/webpack.config.js b/apps/doc-viewer/webpack.config.js
similarity index 100%
rename from apps/remixdocgen/webpack.config.js
rename to apps/doc-viewer/webpack.config.js