diff --git a/.github/workflows/frontend.yml b/.github/workflows/frontend.yml
index 5c9ae70e6f8..ba566153c87 100644
--- a/.github/workflows/frontend.yml
+++ b/.github/workflows/frontend.yml
@@ -60,7 +60,7 @@ jobs:
         if: always()
         run: if [ -d "logs" ]; then cat logs/*; fi
 
-  run-tests-in-zeppelin-web-angular:
+  run-tests-in-zeppelin-web:
     runs-on: ubuntu-20.04
     steps:
       - name: Checkout
@@ -84,7 +84,7 @@ jobs:
           restore-keys: |
             ${{ runner.os }}-zeppelin-
       - name: Run headless test
-        run: xvfb-run --auto-servernum --server-args="-screen 0 1024x768x24" ./mvnw package -pl zeppelin-web-angular ${MAVEN_ARGS}
+        run: xvfb-run --auto-servernum --server-args="-screen 0 1024x768x24" ./mvnw package -pl zeppelin-web ${MAVEN_ARGS}
 
   test-selenium-with-spark-module-for-spark-3-4:
     runs-on: ubuntu-20.04
diff --git a/bin/common.sh b/bin/common.sh
index b33712bff6a..b4e1f5a8513 100644
--- a/bin/common.sh
+++ b/bin/common.sh
@@ -51,10 +51,10 @@ if [[ -z "${ZEPPELIN_CLASSIC_WAR}" ]]; then
 fi
 
 if [[ -z "${ZEPPELIN_WAR}" ]]; then
-  if [[ -d "${ZEPPELIN_HOME}/zeppelin-web-angular/dist" ]]; then
-    export ZEPPELIN_WAR="${ZEPPELIN_HOME}/zeppelin-web-angular/dist/zeppelin"
+  if [[ -d "${ZEPPELIN_HOME}/zeppelin-web/dist" ]]; then
+    export ZEPPELIN_WAR="${ZEPPELIN_HOME}/zeppelin-web/dist/zeppelin"
   else
-    ZEPPELIN_WAR=$(find -L "${ZEPPELIN_HOME}" -name "zeppelin-web-angular*.war")
+    ZEPPELIN_WAR=$(find -L "${ZEPPELIN_HOME}" -name "zeppelin-web*.war")
     export ZEPPELIN_WAR
   fi
 fi
diff --git a/bin/zeppelin-daemon.sh b/bin/zeppelin-daemon.sh
index 613de5d8901..e21c16b26ae 100755
--- a/bin/zeppelin-daemon.sh
+++ b/bin/zeppelin-daemon.sh
@@ -81,7 +81,7 @@ addJarInDir "${ZEPPELIN_HOME}/zeppelin-interpreter/target/lib"
 addJarInDir "${ZEPPELIN_HOME}/zeppelin-zengine/target/lib"
 addJarInDir "${ZEPPELIN_HOME}/zeppelin-server/target/lib"
 addJarInDir "${ZEPPELIN_HOME}/zeppelin-web-classic/target/lib"
-addJarInDir "${ZEPPELIN_HOME}/zeppelin-web-angular/target/lib"
+addJarInDir "${ZEPPELIN_HOME}/zeppelin-web/target/lib"
 
 ## Add hadoop jars when env USE_HADOOP is true
 if [[ "${USE_HADOOP}" != "false"  ]]; then
diff --git a/bin/zeppelin.cmd b/bin/zeppelin.cmd
index c905b6658c6..cc7e56a6f08 100644
--- a/bin/zeppelin.cmd
+++ b/bin/zeppelin.cmd
@@ -61,7 +61,7 @@ call "%bin%\functions.cmd" ADDJARINDIR "%ZEPPELIN_HOME%\zeppelin-interpreter\tar
 call "%bin%\functions.cmd" ADDJARINDIR "%ZEPPELIN_HOME%\zeppelin-zengine\target\lib"
 call "%bin%\functions.cmd" ADDJARINDIR "%ZEPPELIN_HOME%\zeppelin-server\target\lib"
 call "%bin%\functions.cmd" ADDJARINDIR "%ZEPPELIN_HOME%\zeppelin-web-classic\target\lib"
-call "%bin%\functions.cmd" ADDJARINDIR "%ZEPPELIN_HOME%\zeppelin-web-angular\target\lib"
+call "%bin%\functions.cmd" ADDJARINDIR "%ZEPPELIN_HOME%\zeppelin-web\target\lib"
 
 if not defined CLASSPATH (
     set CLASSPATH=%ZEPPELIN_CLASSPATH%
diff --git a/bin/zeppelin.sh b/bin/zeppelin.sh
index df08a32edd3..f11ad6794a4 100755
--- a/bin/zeppelin.sh
+++ b/bin/zeppelin.sh
@@ -111,7 +111,7 @@ addJarInDir "${ZEPPELIN_HOME}/zeppelin-interpreter/target/lib"
 addJarInDir "${ZEPPELIN_HOME}/zeppelin-zengine/target/lib"
 addJarInDir "${ZEPPELIN_HOME}/zeppelin-server/target/lib"
 addJarInDir "${ZEPPELIN_HOME}/zeppelin-web-classic/target/lib"
-addJarInDir "${ZEPPELIN_HOME}/zeppelin-web-angular/target/lib"
+addJarInDir "${ZEPPELIN_HOME}/zeppelin-web/target/lib"
 
 ZEPPELIN_CLASSPATH="$CLASSPATH:$ZEPPELIN_CLASSPATH"
 
diff --git a/pom.xml b/pom.xml
index 945546b482e..0a195277347 100644
--- a/pom.xml
+++ b/pom.xml
@@ -85,7 +85,7 @@
     <module>zeppelin-common</module>
     <module>zeppelin-client</module>
     <module>zeppelin-client-examples</module>
-    <module>zeppelin-web-angular</module>
+    <module>zeppelin-web</module>
     <module>zeppelin-server</module>
     <module>zeppelin-jupyter</module>
     <module>zeppelin-plugins</module>
@@ -1075,7 +1075,7 @@
               <exclude>**/e2e/**/**.spec.js</exclude>
               <exclude>package-lock.json</exclude>
 
-              <!-- bundled from zeppelin-web-angular -->
+              <!-- bundled from zeppelin-web -->
               <exclude>**/*.json</exclude>
               <exclude>**/browserslist</exclude>
               <exclude>**/.prettierrc</exclude>
diff --git a/scripts/docker/zeppelin-server/Dockerfile b/scripts/docker/zeppelin-server/Dockerfile
index 5e1ec129147..c193171c194 100644
--- a/scripts/docker/zeppelin-server/Dockerfile
+++ b/scripts/docker/zeppelin-server/Dockerfile
@@ -49,7 +49,7 @@ ENV LANG=en_US.UTF-8 \
 
 # Copy Zeppelin related files
 COPY --from=zeppelin-distribution /opt/zeppelin/zeppelin-web-classic-${VERSION}.war ${ZEPPELIN_HOME}/
-COPY --from=zeppelin-distribution /opt/zeppelin/zeppelin-web-angular-${VERSION}.war ${ZEPPELIN_HOME}/
+COPY --from=zeppelin-distribution /opt/zeppelin/zeppelin-web-${VERSION}.war ${ZEPPELIN_HOME}/
 COPY --from=zeppelin-distribution /opt/zeppelin/conf ${ZEPPELIN_HOME}/conf
 COPY --from=zeppelin-distribution /opt/zeppelin/bin ${ZEPPELIN_HOME}/bin
 COPY --from=zeppelin-distribution /opt/zeppelin/lib ${ZEPPELIN_HOME}/lib
diff --git a/zeppelin-distribution/pom.xml b/zeppelin-distribution/pom.xml
index 42a05a2d258..81a82c39094 100644
--- a/zeppelin-distribution/pom.xml
+++ b/zeppelin-distribution/pom.xml
@@ -39,7 +39,7 @@
     </dependency>
     <dependency>
       <groupId>${project.groupId}</groupId>
-      <artifactId>zeppelin-web-angular</artifactId>
+      <artifactId>zeppelin-web</artifactId>
       <version>${project.version}</version>
       <type>war</type>
     </dependency>
diff --git a/zeppelin-distribution/src/assemble/distribution.xml b/zeppelin-distribution/src/assemble/distribution.xml
index 1df79cb2c8f..f227278b08e 100644
--- a/zeppelin-distribution/src/assemble/distribution.xml
+++ b/zeppelin-distribution/src/assemble/distribution.xml
@@ -34,7 +34,7 @@
       <!-- Now, select which projects to include in this module-set. -->
       <includes>
         <include>${project.groupId}:zeppelin-web-classic</include>
-        <include>${project.groupId}:zeppelin-web-angular</include>
+        <include>${project.groupId}:zeppelin-web</include>
       </includes>
       <useProjectArtifact>false</useProjectArtifact>
       <useTransitiveDependencies>false</useTransitiveDependencies>
@@ -43,7 +43,7 @@
       <outputDirectory>/lib</outputDirectory>
       <excludes>
         <exclude>${project.groupId}:zeppelin-web-classic</exclude>
-        <exclude>${project.groupId}:zeppelin-web-angular</exclude>
+        <exclude>${project.groupId}:zeppelin-web</exclude>
       </excludes>
       <useProjectArtifact>false</useProjectArtifact>
       <useTransitiveFiltering>true</useTransitiveFiltering>
diff --git a/zeppelin-interpreter/src/main/java/org/apache/zeppelin/conf/ZeppelinConfiguration.java b/zeppelin-interpreter/src/main/java/org/apache/zeppelin/conf/ZeppelinConfiguration.java
index f37bf3834bd..3ff883b781d 100644
--- a/zeppelin-interpreter/src/main/java/org/apache/zeppelin/conf/ZeppelinConfiguration.java
+++ b/zeppelin-interpreter/src/main/java/org/apache/zeppelin/conf/ZeppelinConfiguration.java
@@ -963,7 +963,7 @@ public enum ConfVars {
     ZEPPELIN_SSL_TRUSTSTORE_TYPE("zeppelin.ssl.truststore.type", null),
     ZEPPELIN_SSL_TRUSTSTORE_PASSWORD("zeppelin.ssl.truststore.password", null),
     ZEPPELIN_CLASSIC_WAR("zeppelin.classic.war", "zeppelin-web-classic/dist"),
-    ZEPPELIN_WAR("zeppelin.war", "zeppelin-web-angular/dist"),
+    ZEPPELIN_WAR("zeppelin.war", "zeppelin-web/dist"),
     ZEPPELIN_WAR_TEMPDIR("zeppelin.war.tempdir", "webapps"),
     ZEPPELIN_JMX_ENABLE("zeppelin.jmx.enable", false),
     ZEPPELIN_JMX_PORT("zeppelin.jmx.port", 9996),
diff --git a/zeppelin-server/src/test/java/org/apache/zeppelin/MiniZeppelinServer.java b/zeppelin-server/src/test/java/org/apache/zeppelin/MiniZeppelinServer.java
index 2cf987ab4f6..8a8fbfc9c6a 100644
--- a/zeppelin-server/src/test/java/org/apache/zeppelin/MiniZeppelinServer.java
+++ b/zeppelin-server/src/test/java/org/apache/zeppelin/MiniZeppelinServer.java
@@ -105,7 +105,7 @@ public MiniZeppelinServer(String classname, String zeppelinConfiguration) throws
       zConf.setProperty(ConfVars.ZEPPELIN_WAR.getVarName(),
           webAngularWar.get().getAbsolutePath());
     } else {
-      File dummyWebDir = new File(zeppelinHome, "zeppelin-web-angular" + File.separator + "dist");
+      File dummyWebDir = new File(zeppelinHome, "zeppelin-web" + File.separator + "dist");
       dummyWebDir.mkdirs();
       zConf.setProperty(ZeppelinConfiguration.ConfVars.ZEPPELIN_WAR.getVarName(),
           dummyWebDir.getAbsolutePath());
@@ -127,10 +127,10 @@ private Optional<File> getWebWar() {
 
   private Optional<File> getWebAngularWar() {
     File webWarTargetFolder =
-        new File(".." + File.separator + "zeppelin-web-angular" + File.separator + "target");
+        new File(".." + File.separator + "zeppelin-web" + File.separator + "target");
     if (webWarTargetFolder.exists()) {
       for (File targetFile : webWarTargetFolder.listFiles()) {
-        if (targetFile.getName().contains("zeppelin-web-angular")
+        if (targetFile.getName().contains("zeppelin-web")
             && targetFile.getName().contains(".war")) {
           return Optional.of(targetFile);
         }
diff --git a/zeppelin-server/src/test/java/org/apache/zeppelin/server/IndexHtmlServletTest.java b/zeppelin-server/src/test/java/org/apache/zeppelin/server/IndexHtmlServletTest.java
index 5521b7d285b..a57027cc2ac 100644
--- a/zeppelin-server/src/test/java/org/apache/zeppelin/server/IndexHtmlServletTest.java
+++ b/zeppelin-server/src/test/java/org/apache/zeppelin/server/IndexHtmlServletTest.java
@@ -40,8 +40,8 @@ class IndexHtmlServletTest {
     private final static String TEST_BODY_ADDON = "<!-- foo -->";
     private final static String TEST_HEAD_ADDON = "<!-- bar -->";
 
-    private final static String FILE_PATH_INDEX_HTML_ZEPPELIN_WEB = "../zeppelin-web-classic/dist/index.html";
-    private final static String FILE_PATH_INDEX_HTML_ZEPPELIN_WEB_ANGULAR = "../zeppelin-web-angular/dist/zeppelin/index.html";
+    private final static String FILE_PATH_INDEX_HTML_ZEPPELIN_WEB_CLASSIC = "../zeppelin-web-classic/dist/index.html";
+    private final static String FILE_PATH_INDEX_HTML_ZEPPELIN_WEB = "../zeppelin-web/dist/zeppelin/index.html";
 
 
     @Test
@@ -53,7 +53,7 @@ void testZeppelinWebHtmlAddon() throws IOException, ServletException {
       ServletConfig sc = mock(ServletConfig.class);
       ServletContext ctx = mock(ServletContext.class);
       when(ctx.getResource("/index.html"))
-        .thenReturn(new URL("file:" + FILE_PATH_INDEX_HTML_ZEPPELIN_WEB));
+        .thenReturn(new URL("file:" + FILE_PATH_INDEX_HTML_ZEPPELIN_WEB_CLASSIC));
       when(sc.getServletContext()).thenReturn(ctx);
 
       IndexHtmlServlet servlet = new IndexHtmlServlet(zConf);
@@ -78,7 +78,7 @@ void testZeppelinWebHtmlAddon() throws IOException, ServletException {
     }
 
     @Test
-    @Disabled("ignored due to zeppelin-web-angular not build for core tests")
+    @Disabled("ignored due to zeppelin-web not build for core tests")
     void testZeppelinWebAngularHtmlAddon() throws IOException, ServletException {
       ZeppelinConfiguration zConf = mock(ZeppelinConfiguration.class);
       when(zConf.getHtmlBodyAddon()).thenReturn(TEST_BODY_ADDON);
@@ -87,7 +87,7 @@ void testZeppelinWebAngularHtmlAddon() throws IOException, ServletException {
       ServletConfig sc = mock(ServletConfig.class);
       ServletContext ctx = mock(ServletContext.class);
       when(ctx.getResource("/index.html"))
-        .thenReturn(new URL("file:" + FILE_PATH_INDEX_HTML_ZEPPELIN_WEB_ANGULAR));
+        .thenReturn(new URL("file:" + FILE_PATH_INDEX_HTML_ZEPPELIN_WEB));
       when(sc.getServletContext()).thenReturn(ctx);
 
       IndexHtmlServlet servlet = new IndexHtmlServlet(zConf);
diff --git a/zeppelin-web-angular/.editorconfig b/zeppelin-web/.editorconfig
similarity index 100%
rename from zeppelin-web-angular/.editorconfig
rename to zeppelin-web/.editorconfig
diff --git a/zeppelin-web-angular/.gitignore b/zeppelin-web/.gitignore
similarity index 100%
rename from zeppelin-web-angular/.gitignore
rename to zeppelin-web/.gitignore
diff --git a/zeppelin-web-angular/.prettierignore b/zeppelin-web/.prettierignore
similarity index 100%
rename from zeppelin-web-angular/.prettierignore
rename to zeppelin-web/.prettierignore
diff --git a/zeppelin-web-angular/.prettierrc b/zeppelin-web/.prettierrc
similarity index 100%
rename from zeppelin-web-angular/.prettierrc
rename to zeppelin-web/.prettierrc
diff --git a/zeppelin-web-angular/README.md b/zeppelin-web/README.md
similarity index 100%
rename from zeppelin-web-angular/README.md
rename to zeppelin-web/README.md
diff --git a/zeppelin-web-angular/WEB-INF/web.xml b/zeppelin-web/WEB-INF/web.xml
similarity index 100%
rename from zeppelin-web-angular/WEB-INF/web.xml
rename to zeppelin-web/WEB-INF/web.xml
diff --git a/zeppelin-web-angular/angular.json b/zeppelin-web/angular.json
similarity index 100%
rename from zeppelin-web-angular/angular.json
rename to zeppelin-web/angular.json
diff --git a/zeppelin-web-angular/browserslist b/zeppelin-web/browserslist
similarity index 100%
rename from zeppelin-web-angular/browserslist
rename to zeppelin-web/browserslist
diff --git a/zeppelin-web-angular/e2e/protractor.conf.js b/zeppelin-web/e2e/protractor.conf.js
similarity index 100%
rename from zeppelin-web-angular/e2e/protractor.conf.js
rename to zeppelin-web/e2e/protractor.conf.js
diff --git a/zeppelin-web-angular/e2e/src/app.e2e-spec.ts b/zeppelin-web/e2e/src/app.e2e-spec.ts
similarity index 100%
rename from zeppelin-web-angular/e2e/src/app.e2e-spec.ts
rename to zeppelin-web/e2e/src/app.e2e-spec.ts
diff --git a/zeppelin-web-angular/e2e/src/app.po.ts b/zeppelin-web/e2e/src/app.po.ts
similarity index 100%
rename from zeppelin-web-angular/e2e/src/app.po.ts
rename to zeppelin-web/e2e/src/app.po.ts
diff --git a/zeppelin-web-angular/e2e/tsconfig.json b/zeppelin-web/e2e/tsconfig.json
similarity index 100%
rename from zeppelin-web-angular/e2e/tsconfig.json
rename to zeppelin-web/e2e/tsconfig.json
diff --git a/zeppelin-web-angular/karma.conf.js b/zeppelin-web/karma.conf.js
similarity index 100%
rename from zeppelin-web-angular/karma.conf.js
rename to zeppelin-web/karma.conf.js
diff --git a/zeppelin-web-angular/package-lock.json b/zeppelin-web/package-lock.json
similarity index 100%
rename from zeppelin-web-angular/package-lock.json
rename to zeppelin-web/package-lock.json
diff --git a/zeppelin-web-angular/package.json b/zeppelin-web/package.json
similarity index 100%
rename from zeppelin-web-angular/package.json
rename to zeppelin-web/package.json
diff --git a/zeppelin-web-angular/pom.xml b/zeppelin-web/pom.xml
similarity index 100%
rename from zeppelin-web-angular/pom.xml
rename to zeppelin-web/pom.xml
diff --git a/zeppelin-web-angular/projects/helium-vis-example/README.md b/zeppelin-web/projects/helium-vis-example/README.md
similarity index 100%
rename from zeppelin-web-angular/projects/helium-vis-example/README.md
rename to zeppelin-web/projects/helium-vis-example/README.md
diff --git a/zeppelin-web-angular/projects/helium-vis-example/karma.conf.js b/zeppelin-web/projects/helium-vis-example/karma.conf.js
similarity index 100%
rename from zeppelin-web-angular/projects/helium-vis-example/karma.conf.js
rename to zeppelin-web/projects/helium-vis-example/karma.conf.js
diff --git a/zeppelin-web-angular/projects/helium-vis-example/ng-package.json b/zeppelin-web/projects/helium-vis-example/ng-package.json
similarity index 100%
rename from zeppelin-web-angular/projects/helium-vis-example/ng-package.json
rename to zeppelin-web/projects/helium-vis-example/ng-package.json
diff --git a/zeppelin-web-angular/projects/helium-vis-example/package.json b/zeppelin-web/projects/helium-vis-example/package.json
similarity index 100%
rename from zeppelin-web-angular/projects/helium-vis-example/package.json
rename to zeppelin-web/projects/helium-vis-example/package.json
diff --git a/zeppelin-web-angular/projects/helium-vis-example/src/json-vis.component.ts b/zeppelin-web/projects/helium-vis-example/src/json-vis.component.ts
similarity index 100%
rename from zeppelin-web-angular/projects/helium-vis-example/src/json-vis.component.ts
rename to zeppelin-web/projects/helium-vis-example/src/json-vis.component.ts
diff --git a/zeppelin-web-angular/projects/helium-vis-example/src/json-vis.module.ts b/zeppelin-web/projects/helium-vis-example/src/json-vis.module.ts
similarity index 100%
rename from zeppelin-web-angular/projects/helium-vis-example/src/json-vis.module.ts
rename to zeppelin-web/projects/helium-vis-example/src/json-vis.module.ts
diff --git a/zeppelin-web-angular/projects/helium-vis-example/src/json-visualization.ts b/zeppelin-web/projects/helium-vis-example/src/json-visualization.ts
similarity index 100%
rename from zeppelin-web-angular/projects/helium-vis-example/src/json-visualization.ts
rename to zeppelin-web/projects/helium-vis-example/src/json-visualization.ts
diff --git a/zeppelin-web-angular/projects/helium-vis-example/src/public-api.ts b/zeppelin-web/projects/helium-vis-example/src/public-api.ts
similarity index 100%
rename from zeppelin-web-angular/projects/helium-vis-example/src/public-api.ts
rename to zeppelin-web/projects/helium-vis-example/src/public-api.ts
diff --git a/zeppelin-web-angular/projects/helium-vis-example/src/test.ts b/zeppelin-web/projects/helium-vis-example/src/test.ts
similarity index 100%
rename from zeppelin-web-angular/projects/helium-vis-example/src/test.ts
rename to zeppelin-web/projects/helium-vis-example/src/test.ts
diff --git a/zeppelin-web-angular/projects/helium-vis-example/tsconfig.lib.json b/zeppelin-web/projects/helium-vis-example/tsconfig.lib.json
similarity index 100%
rename from zeppelin-web-angular/projects/helium-vis-example/tsconfig.lib.json
rename to zeppelin-web/projects/helium-vis-example/tsconfig.lib.json
diff --git a/zeppelin-web-angular/projects/helium-vis-example/tsconfig.spec.json b/zeppelin-web/projects/helium-vis-example/tsconfig.spec.json
similarity index 100%
rename from zeppelin-web-angular/projects/helium-vis-example/tsconfig.spec.json
rename to zeppelin-web/projects/helium-vis-example/tsconfig.spec.json
diff --git a/zeppelin-web-angular/projects/helium-vis-example/tslint.json b/zeppelin-web/projects/helium-vis-example/tslint.json
similarity index 100%
rename from zeppelin-web-angular/projects/helium-vis-example/tslint.json
rename to zeppelin-web/projects/helium-vis-example/tslint.json
diff --git a/zeppelin-web-angular/projects/zeppelin-helium/README.md b/zeppelin-web/projects/zeppelin-helium/README.md
similarity index 100%
rename from zeppelin-web-angular/projects/zeppelin-helium/README.md
rename to zeppelin-web/projects/zeppelin-helium/README.md
diff --git a/zeppelin-web-angular/projects/zeppelin-helium/karma.conf.js b/zeppelin-web/projects/zeppelin-helium/karma.conf.js
similarity index 100%
rename from zeppelin-web-angular/projects/zeppelin-helium/karma.conf.js
rename to zeppelin-web/projects/zeppelin-helium/karma.conf.js
diff --git a/zeppelin-web-angular/projects/zeppelin-helium/ng-package.json b/zeppelin-web/projects/zeppelin-helium/ng-package.json
similarity index 100%
rename from zeppelin-web-angular/projects/zeppelin-helium/ng-package.json
rename to zeppelin-web/projects/zeppelin-helium/ng-package.json
diff --git a/zeppelin-web-angular/projects/zeppelin-helium/package.json b/zeppelin-web/projects/zeppelin-helium/package.json
similarity index 100%
rename from zeppelin-web-angular/projects/zeppelin-helium/package.json
rename to zeppelin-web/projects/zeppelin-helium/package.json
diff --git a/zeppelin-web-angular/projects/zeppelin-helium/src/common-deps.ts b/zeppelin-web/projects/zeppelin-helium/src/common-deps.ts
similarity index 100%
rename from zeppelin-web-angular/projects/zeppelin-helium/src/common-deps.ts
rename to zeppelin-web/projects/zeppelin-helium/src/common-deps.ts
diff --git a/zeppelin-web-angular/projects/zeppelin-helium/src/index.ts b/zeppelin-web/projects/zeppelin-helium/src/index.ts
similarity index 100%
rename from zeppelin-web-angular/projects/zeppelin-helium/src/index.ts
rename to zeppelin-web/projects/zeppelin-helium/src/index.ts
diff --git a/zeppelin-web-angular/projects/zeppelin-helium/src/public-api.ts b/zeppelin-web/projects/zeppelin-helium/src/public-api.ts
similarity index 100%
rename from zeppelin-web-angular/projects/zeppelin-helium/src/public-api.ts
rename to zeppelin-web/projects/zeppelin-helium/src/public-api.ts
diff --git a/zeppelin-web-angular/projects/zeppelin-helium/src/test.ts b/zeppelin-web/projects/zeppelin-helium/src/test.ts
similarity index 100%
rename from zeppelin-web-angular/projects/zeppelin-helium/src/test.ts
rename to zeppelin-web/projects/zeppelin-helium/src/test.ts
diff --git a/zeppelin-web-angular/projects/zeppelin-helium/src/zeppelin-helium.module.ts b/zeppelin-web/projects/zeppelin-helium/src/zeppelin-helium.module.ts
similarity index 100%
rename from zeppelin-web-angular/projects/zeppelin-helium/src/zeppelin-helium.module.ts
rename to zeppelin-web/projects/zeppelin-helium/src/zeppelin-helium.module.ts
diff --git a/zeppelin-web-angular/projects/zeppelin-helium/src/zeppelin-helium.service.ts b/zeppelin-web/projects/zeppelin-helium/src/zeppelin-helium.service.ts
similarity index 100%
rename from zeppelin-web-angular/projects/zeppelin-helium/src/zeppelin-helium.service.ts
rename to zeppelin-web/projects/zeppelin-helium/src/zeppelin-helium.service.ts
diff --git a/zeppelin-web-angular/projects/zeppelin-helium/tsconfig.lib.json b/zeppelin-web/projects/zeppelin-helium/tsconfig.lib.json
similarity index 100%
rename from zeppelin-web-angular/projects/zeppelin-helium/tsconfig.lib.json
rename to zeppelin-web/projects/zeppelin-helium/tsconfig.lib.json
diff --git a/zeppelin-web-angular/projects/zeppelin-helium/tsconfig.spec.json b/zeppelin-web/projects/zeppelin-helium/tsconfig.spec.json
similarity index 100%
rename from zeppelin-web-angular/projects/zeppelin-helium/tsconfig.spec.json
rename to zeppelin-web/projects/zeppelin-helium/tsconfig.spec.json
diff --git a/zeppelin-web-angular/projects/zeppelin-helium/tslint.json b/zeppelin-web/projects/zeppelin-helium/tslint.json
similarity index 100%
rename from zeppelin-web-angular/projects/zeppelin-helium/tslint.json
rename to zeppelin-web/projects/zeppelin-helium/tslint.json
diff --git a/zeppelin-web-angular/projects/zeppelin-sdk/README.md b/zeppelin-web/projects/zeppelin-sdk/README.md
similarity index 100%
rename from zeppelin-web-angular/projects/zeppelin-sdk/README.md
rename to zeppelin-web/projects/zeppelin-sdk/README.md
diff --git a/zeppelin-web-angular/projects/zeppelin-sdk/karma.conf.js b/zeppelin-web/projects/zeppelin-sdk/karma.conf.js
similarity index 100%
rename from zeppelin-web-angular/projects/zeppelin-sdk/karma.conf.js
rename to zeppelin-web/projects/zeppelin-sdk/karma.conf.js
diff --git a/zeppelin-web-angular/projects/zeppelin-sdk/ng-package.json b/zeppelin-web/projects/zeppelin-sdk/ng-package.json
similarity index 100%
rename from zeppelin-web-angular/projects/zeppelin-sdk/ng-package.json
rename to zeppelin-web/projects/zeppelin-sdk/ng-package.json
diff --git a/zeppelin-web-angular/projects/zeppelin-sdk/package.json b/zeppelin-web/projects/zeppelin-sdk/package.json
similarity index 100%
rename from zeppelin-web-angular/projects/zeppelin-sdk/package.json
rename to zeppelin-web/projects/zeppelin-sdk/package.json
diff --git a/zeppelin-web-angular/projects/zeppelin-sdk/src/index.ts b/zeppelin-web/projects/zeppelin-sdk/src/index.ts
similarity index 100%
rename from zeppelin-web-angular/projects/zeppelin-sdk/src/index.ts
rename to zeppelin-web/projects/zeppelin-sdk/src/index.ts
diff --git a/zeppelin-web-angular/projects/zeppelin-sdk/src/interfaces/index.ts b/zeppelin-web/projects/zeppelin-sdk/src/interfaces/index.ts
similarity index 100%
rename from zeppelin-web-angular/projects/zeppelin-sdk/src/interfaces/index.ts
rename to zeppelin-web/projects/zeppelin-sdk/src/interfaces/index.ts
diff --git a/zeppelin-web-angular/projects/zeppelin-sdk/src/interfaces/message-common.interface.ts b/zeppelin-web/projects/zeppelin-sdk/src/interfaces/message-common.interface.ts
similarity index 100%
rename from zeppelin-web-angular/projects/zeppelin-sdk/src/interfaces/message-common.interface.ts
rename to zeppelin-web/projects/zeppelin-sdk/src/interfaces/message-common.interface.ts
diff --git a/zeppelin-web-angular/projects/zeppelin-sdk/src/interfaces/message-data-type-map.interface.ts b/zeppelin-web/projects/zeppelin-sdk/src/interfaces/message-data-type-map.interface.ts
similarity index 100%
rename from zeppelin-web-angular/projects/zeppelin-sdk/src/interfaces/message-data-type-map.interface.ts
rename to zeppelin-web/projects/zeppelin-sdk/src/interfaces/message-data-type-map.interface.ts
diff --git a/zeppelin-web-angular/projects/zeppelin-sdk/src/interfaces/message-interpreter.interface.ts b/zeppelin-web/projects/zeppelin-sdk/src/interfaces/message-interpreter.interface.ts
similarity index 100%
rename from zeppelin-web-angular/projects/zeppelin-sdk/src/interfaces/message-interpreter.interface.ts
rename to zeppelin-web/projects/zeppelin-sdk/src/interfaces/message-interpreter.interface.ts
diff --git a/zeppelin-web-angular/projects/zeppelin-sdk/src/interfaces/message-job.interface.ts b/zeppelin-web/projects/zeppelin-sdk/src/interfaces/message-job.interface.ts
similarity index 100%
rename from zeppelin-web-angular/projects/zeppelin-sdk/src/interfaces/message-job.interface.ts
rename to zeppelin-web/projects/zeppelin-sdk/src/interfaces/message-job.interface.ts
diff --git a/zeppelin-web-angular/projects/zeppelin-sdk/src/interfaces/message-notebook.interface.ts b/zeppelin-web/projects/zeppelin-sdk/src/interfaces/message-notebook.interface.ts
similarity index 100%
rename from zeppelin-web-angular/projects/zeppelin-sdk/src/interfaces/message-notebook.interface.ts
rename to zeppelin-web/projects/zeppelin-sdk/src/interfaces/message-notebook.interface.ts
diff --git a/zeppelin-web-angular/projects/zeppelin-sdk/src/interfaces/message-operator.interface.ts b/zeppelin-web/projects/zeppelin-sdk/src/interfaces/message-operator.interface.ts
similarity index 100%
rename from zeppelin-web-angular/projects/zeppelin-sdk/src/interfaces/message-operator.interface.ts
rename to zeppelin-web/projects/zeppelin-sdk/src/interfaces/message-operator.interface.ts
diff --git a/zeppelin-web-angular/projects/zeppelin-sdk/src/interfaces/message-paragraph.interface.ts b/zeppelin-web/projects/zeppelin-sdk/src/interfaces/message-paragraph.interface.ts
similarity index 100%
rename from zeppelin-web-angular/projects/zeppelin-sdk/src/interfaces/message-paragraph.interface.ts
rename to zeppelin-web/projects/zeppelin-sdk/src/interfaces/message-paragraph.interface.ts
diff --git a/zeppelin-web-angular/projects/zeppelin-sdk/src/interfaces/public-api.ts b/zeppelin-web/projects/zeppelin-sdk/src/interfaces/public-api.ts
similarity index 100%
rename from zeppelin-web-angular/projects/zeppelin-sdk/src/interfaces/public-api.ts
rename to zeppelin-web/projects/zeppelin-sdk/src/interfaces/public-api.ts
diff --git a/zeppelin-web-angular/projects/zeppelin-sdk/src/interfaces/websocket-message.interface.ts b/zeppelin-web/projects/zeppelin-sdk/src/interfaces/websocket-message.interface.ts
similarity index 100%
rename from zeppelin-web-angular/projects/zeppelin-sdk/src/interfaces/websocket-message.interface.ts
rename to zeppelin-web/projects/zeppelin-sdk/src/interfaces/websocket-message.interface.ts
diff --git a/zeppelin-web-angular/projects/zeppelin-sdk/src/message.ts b/zeppelin-web/projects/zeppelin-sdk/src/message.ts
similarity index 100%
rename from zeppelin-web-angular/projects/zeppelin-sdk/src/message.ts
rename to zeppelin-web/projects/zeppelin-sdk/src/message.ts
diff --git a/zeppelin-web-angular/projects/zeppelin-sdk/src/public-api.ts b/zeppelin-web/projects/zeppelin-sdk/src/public-api.ts
similarity index 100%
rename from zeppelin-web-angular/projects/zeppelin-sdk/src/public-api.ts
rename to zeppelin-web/projects/zeppelin-sdk/src/public-api.ts
diff --git a/zeppelin-web-angular/projects/zeppelin-sdk/tsconfig.lib.json b/zeppelin-web/projects/zeppelin-sdk/tsconfig.lib.json
similarity index 100%
rename from zeppelin-web-angular/projects/zeppelin-sdk/tsconfig.lib.json
rename to zeppelin-web/projects/zeppelin-sdk/tsconfig.lib.json
diff --git a/zeppelin-web-angular/projects/zeppelin-sdk/tsconfig.spec.json b/zeppelin-web/projects/zeppelin-sdk/tsconfig.spec.json
similarity index 100%
rename from zeppelin-web-angular/projects/zeppelin-sdk/tsconfig.spec.json
rename to zeppelin-web/projects/zeppelin-sdk/tsconfig.spec.json
diff --git a/zeppelin-web-angular/projects/zeppelin-sdk/tslint.json b/zeppelin-web/projects/zeppelin-sdk/tslint.json
similarity index 100%
rename from zeppelin-web-angular/projects/zeppelin-sdk/tslint.json
rename to zeppelin-web/projects/zeppelin-sdk/tslint.json
diff --git a/zeppelin-web-angular/projects/zeppelin-visualization/README.md b/zeppelin-web/projects/zeppelin-visualization/README.md
similarity index 100%
rename from zeppelin-web-angular/projects/zeppelin-visualization/README.md
rename to zeppelin-web/projects/zeppelin-visualization/README.md
diff --git a/zeppelin-web-angular/projects/zeppelin-visualization/karma.conf.js b/zeppelin-web/projects/zeppelin-visualization/karma.conf.js
similarity index 100%
rename from zeppelin-web-angular/projects/zeppelin-visualization/karma.conf.js
rename to zeppelin-web/projects/zeppelin-visualization/karma.conf.js
diff --git a/zeppelin-web-angular/projects/zeppelin-visualization/ng-package.json b/zeppelin-web/projects/zeppelin-visualization/ng-package.json
similarity index 100%
rename from zeppelin-web-angular/projects/zeppelin-visualization/ng-package.json
rename to zeppelin-web/projects/zeppelin-visualization/ng-package.json
diff --git a/zeppelin-web-angular/projects/zeppelin-visualization/package.json b/zeppelin-web/projects/zeppelin-visualization/package.json
similarity index 100%
rename from zeppelin-web-angular/projects/zeppelin-visualization/package.json
rename to zeppelin-web/projects/zeppelin-visualization/package.json
diff --git a/zeppelin-web-angular/projects/zeppelin-visualization/src/data-set.ts b/zeppelin-web/projects/zeppelin-visualization/src/data-set.ts
similarity index 100%
rename from zeppelin-web-angular/projects/zeppelin-visualization/src/data-set.ts
rename to zeppelin-web/projects/zeppelin-visualization/src/data-set.ts
diff --git a/zeppelin-web-angular/projects/zeppelin-visualization/src/g2-visualization-base.ts b/zeppelin-web/projects/zeppelin-visualization/src/g2-visualization-base.ts
similarity index 100%
rename from zeppelin-web-angular/projects/zeppelin-visualization/src/g2-visualization-base.ts
rename to zeppelin-web/projects/zeppelin-visualization/src/g2-visualization-base.ts
diff --git a/zeppelin-web-angular/projects/zeppelin-visualization/src/g2-visualization-component-base.ts b/zeppelin-web/projects/zeppelin-visualization/src/g2-visualization-component-base.ts
similarity index 100%
rename from zeppelin-web-angular/projects/zeppelin-visualization/src/g2-visualization-component-base.ts
rename to zeppelin-web/projects/zeppelin-visualization/src/g2-visualization-component-base.ts
diff --git a/zeppelin-web-angular/projects/zeppelin-visualization/src/index.ts b/zeppelin-web/projects/zeppelin-visualization/src/index.ts
similarity index 100%
rename from zeppelin-web-angular/projects/zeppelin-visualization/src/index.ts
rename to zeppelin-web/projects/zeppelin-visualization/src/index.ts
diff --git a/zeppelin-web-angular/projects/zeppelin-visualization/src/pivot-transformation.ts b/zeppelin-web/projects/zeppelin-visualization/src/pivot-transformation.ts
similarity index 100%
rename from zeppelin-web-angular/projects/zeppelin-visualization/src/pivot-transformation.ts
rename to zeppelin-web/projects/zeppelin-visualization/src/pivot-transformation.ts
diff --git a/zeppelin-web-angular/projects/zeppelin-visualization/src/public-api.ts b/zeppelin-web/projects/zeppelin-visualization/src/public-api.ts
similarity index 100%
rename from zeppelin-web-angular/projects/zeppelin-visualization/src/public-api.ts
rename to zeppelin-web/projects/zeppelin-visualization/src/public-api.ts
diff --git a/zeppelin-web-angular/projects/zeppelin-visualization/src/table-data.ts b/zeppelin-web/projects/zeppelin-visualization/src/table-data.ts
similarity index 100%
rename from zeppelin-web-angular/projects/zeppelin-visualization/src/table-data.ts
rename to zeppelin-web/projects/zeppelin-visualization/src/table-data.ts
diff --git a/zeppelin-web-angular/projects/zeppelin-visualization/src/table-transformation.ts b/zeppelin-web/projects/zeppelin-visualization/src/table-transformation.ts
similarity index 100%
rename from zeppelin-web-angular/projects/zeppelin-visualization/src/table-transformation.ts
rename to zeppelin-web/projects/zeppelin-visualization/src/table-transformation.ts
diff --git a/zeppelin-web-angular/projects/zeppelin-visualization/src/transformation.ts b/zeppelin-web/projects/zeppelin-visualization/src/transformation.ts
similarity index 100%
rename from zeppelin-web-angular/projects/zeppelin-visualization/src/transformation.ts
rename to zeppelin-web/projects/zeppelin-visualization/src/transformation.ts
diff --git a/zeppelin-web-angular/projects/zeppelin-visualization/src/visualization-component-portal.ts b/zeppelin-web/projects/zeppelin-visualization/src/visualization-component-portal.ts
similarity index 100%
rename from zeppelin-web-angular/projects/zeppelin-visualization/src/visualization-component-portal.ts
rename to zeppelin-web/projects/zeppelin-visualization/src/visualization-component-portal.ts
diff --git a/zeppelin-web-angular/projects/zeppelin-visualization/src/visualization.ts b/zeppelin-web/projects/zeppelin-visualization/src/visualization.ts
similarity index 100%
rename from zeppelin-web-angular/projects/zeppelin-visualization/src/visualization.ts
rename to zeppelin-web/projects/zeppelin-visualization/src/visualization.ts
diff --git a/zeppelin-web-angular/projects/zeppelin-visualization/tsconfig.lib.json b/zeppelin-web/projects/zeppelin-visualization/tsconfig.lib.json
similarity index 100%
rename from zeppelin-web-angular/projects/zeppelin-visualization/tsconfig.lib.json
rename to zeppelin-web/projects/zeppelin-visualization/tsconfig.lib.json
diff --git a/zeppelin-web-angular/projects/zeppelin-visualization/tsconfig.spec.json b/zeppelin-web/projects/zeppelin-visualization/tsconfig.spec.json
similarity index 100%
rename from zeppelin-web-angular/projects/zeppelin-visualization/tsconfig.spec.json
rename to zeppelin-web/projects/zeppelin-visualization/tsconfig.spec.json
diff --git a/zeppelin-web-angular/projects/zeppelin-visualization/tslint.json b/zeppelin-web/projects/zeppelin-visualization/tslint.json
similarity index 100%
rename from zeppelin-web-angular/projects/zeppelin-visualization/tslint.json
rename to zeppelin-web/projects/zeppelin-visualization/tslint.json
diff --git a/zeppelin-web-angular/proxy.conf.js b/zeppelin-web/proxy.conf.js
similarity index 100%
rename from zeppelin-web-angular/proxy.conf.js
rename to zeppelin-web/proxy.conf.js
diff --git a/zeppelin-web-angular/screenshot.png b/zeppelin-web/screenshot.png
similarity index 100%
rename from zeppelin-web-angular/screenshot.png
rename to zeppelin-web/screenshot.png
diff --git a/zeppelin-web-angular/src/.editorconfig b/zeppelin-web/src/.editorconfig
similarity index 100%
rename from zeppelin-web-angular/src/.editorconfig
rename to zeppelin-web/src/.editorconfig
diff --git a/zeppelin-web-angular/src/.gitignore b/zeppelin-web/src/.gitignore
similarity index 100%
rename from zeppelin-web-angular/src/.gitignore
rename to zeppelin-web/src/.gitignore
diff --git a/zeppelin-web-angular/src/app/app-http.interceptor.ts b/zeppelin-web/src/app/app-http.interceptor.ts
similarity index 100%
rename from zeppelin-web-angular/src/app/app-http.interceptor.ts
rename to zeppelin-web/src/app/app-http.interceptor.ts
diff --git a/zeppelin-web-angular/src/app/app-message.interceptor.ts b/zeppelin-web/src/app/app-message.interceptor.ts
similarity index 100%
rename from zeppelin-web-angular/src/app/app-message.interceptor.ts
rename to zeppelin-web/src/app/app-message.interceptor.ts
diff --git a/zeppelin-web-angular/src/app/app-routing.module.ts b/zeppelin-web/src/app/app-routing.module.ts
similarity index 100%
rename from zeppelin-web-angular/src/app/app-routing.module.ts
rename to zeppelin-web/src/app/app-routing.module.ts
diff --git a/zeppelin-web-angular/src/app/app-runtime-compiler.providers.ts b/zeppelin-web/src/app/app-runtime-compiler.providers.ts
similarity index 100%
rename from zeppelin-web-angular/src/app/app-runtime-compiler.providers.ts
rename to zeppelin-web/src/app/app-runtime-compiler.providers.ts
diff --git a/zeppelin-web-angular/src/app/app.component.html b/zeppelin-web/src/app/app.component.html
similarity index 100%
rename from zeppelin-web-angular/src/app/app.component.html
rename to zeppelin-web/src/app/app.component.html
diff --git a/zeppelin-web-angular/src/app/app.component.less b/zeppelin-web/src/app/app.component.less
similarity index 100%
rename from zeppelin-web-angular/src/app/app.component.less
rename to zeppelin-web/src/app/app.component.less
diff --git a/zeppelin-web-angular/src/app/app.component.spec.ts b/zeppelin-web/src/app/app.component.spec.ts
similarity index 100%
rename from zeppelin-web-angular/src/app/app.component.spec.ts
rename to zeppelin-web/src/app/app.component.spec.ts
diff --git a/zeppelin-web-angular/src/app/app.component.ts b/zeppelin-web/src/app/app.component.ts
similarity index 100%
rename from zeppelin-web-angular/src/app/app.component.ts
rename to zeppelin-web/src/app/app.component.ts
diff --git a/zeppelin-web-angular/src/app/app.module.ts b/zeppelin-web/src/app/app.module.ts
similarity index 100%
rename from zeppelin-web-angular/src/app/app.module.ts
rename to zeppelin-web/src/app/app.module.ts
diff --git a/zeppelin-web-angular/src/app/core/copy-text/copy-text-to-clipboard.ts b/zeppelin-web/src/app/core/copy-text/copy-text-to-clipboard.ts
similarity index 100%
rename from zeppelin-web-angular/src/app/core/copy-text/copy-text-to-clipboard.ts
rename to zeppelin-web/src/app/core/copy-text/copy-text-to-clipboard.ts
diff --git a/zeppelin-web-angular/src/app/core/copy-text/index.ts b/zeppelin-web/src/app/core/copy-text/index.ts
similarity index 100%
rename from zeppelin-web-angular/src/app/core/copy-text/index.ts
rename to zeppelin-web/src/app/core/copy-text/index.ts
diff --git a/zeppelin-web-angular/src/app/core/copy-text/public-api.ts b/zeppelin-web/src/app/core/copy-text/public-api.ts
similarity index 100%
rename from zeppelin-web-angular/src/app/core/copy-text/public-api.ts
rename to zeppelin-web/src/app/core/copy-text/public-api.ts
diff --git a/zeppelin-web-angular/src/app/core/destroy-hook/destroy-hook.component.ts b/zeppelin-web/src/app/core/destroy-hook/destroy-hook.component.ts
similarity index 100%
rename from zeppelin-web-angular/src/app/core/destroy-hook/destroy-hook.component.ts
rename to zeppelin-web/src/app/core/destroy-hook/destroy-hook.component.ts
diff --git a/zeppelin-web-angular/src/app/core/destroy-hook/index.ts b/zeppelin-web/src/app/core/destroy-hook/index.ts
similarity index 100%
rename from zeppelin-web-angular/src/app/core/destroy-hook/index.ts
rename to zeppelin-web/src/app/core/destroy-hook/index.ts
diff --git a/zeppelin-web-angular/src/app/core/destroy-hook/public-api.ts b/zeppelin-web/src/app/core/destroy-hook/public-api.ts
similarity index 100%
rename from zeppelin-web-angular/src/app/core/destroy-hook/public-api.ts
rename to zeppelin-web/src/app/core/destroy-hook/public-api.ts
diff --git a/zeppelin-web-angular/src/app/core/index.ts b/zeppelin-web/src/app/core/index.ts
similarity index 100%
rename from zeppelin-web-angular/src/app/core/index.ts
rename to zeppelin-web/src/app/core/index.ts
diff --git a/zeppelin-web-angular/src/app/core/message-listener/index.ts b/zeppelin-web/src/app/core/message-listener/index.ts
similarity index 100%
rename from zeppelin-web-angular/src/app/core/message-listener/index.ts
rename to zeppelin-web/src/app/core/message-listener/index.ts
diff --git a/zeppelin-web-angular/src/app/core/message-listener/message-listener.ts b/zeppelin-web/src/app/core/message-listener/message-listener.ts
similarity index 100%
rename from zeppelin-web-angular/src/app/core/message-listener/message-listener.ts
rename to zeppelin-web/src/app/core/message-listener/message-listener.ts
diff --git a/zeppelin-web-angular/src/app/core/message-listener/public-api.ts b/zeppelin-web/src/app/core/message-listener/public-api.ts
similarity index 100%
rename from zeppelin-web-angular/src/app/core/message-listener/public-api.ts
rename to zeppelin-web/src/app/core/message-listener/public-api.ts
diff --git a/zeppelin-web-angular/src/app/core/paragraph-base/index.ts b/zeppelin-web/src/app/core/paragraph-base/index.ts
similarity index 100%
rename from zeppelin-web-angular/src/app/core/paragraph-base/index.ts
rename to zeppelin-web/src/app/core/paragraph-base/index.ts
diff --git a/zeppelin-web-angular/src/app/core/paragraph-base/paragraph-base.ts b/zeppelin-web/src/app/core/paragraph-base/paragraph-base.ts
similarity index 100%
rename from zeppelin-web-angular/src/app/core/paragraph-base/paragraph-base.ts
rename to zeppelin-web/src/app/core/paragraph-base/paragraph-base.ts
diff --git a/zeppelin-web-angular/src/app/core/paragraph-base/public-api.ts b/zeppelin-web/src/app/core/paragraph-base/public-api.ts
similarity index 100%
rename from zeppelin-web-angular/src/app/core/paragraph-base/public-api.ts
rename to zeppelin-web/src/app/core/paragraph-base/public-api.ts
diff --git a/zeppelin-web-angular/src/app/core/paragraph-base/published.ts b/zeppelin-web/src/app/core/paragraph-base/published.ts
similarity index 100%
rename from zeppelin-web-angular/src/app/core/paragraph-base/published.ts
rename to zeppelin-web/src/app/core/paragraph-base/published.ts
diff --git a/zeppelin-web-angular/src/app/core/public-api.ts b/zeppelin-web/src/app/core/public-api.ts
similarity index 100%
rename from zeppelin-web-angular/src/app/core/public-api.ts
rename to zeppelin-web/src/app/core/public-api.ts
diff --git a/zeppelin-web-angular/src/app/core/runtime-dynamic-module/index.ts b/zeppelin-web/src/app/core/runtime-dynamic-module/index.ts
similarity index 100%
rename from zeppelin-web-angular/src/app/core/runtime-dynamic-module/index.ts
rename to zeppelin-web/src/app/core/runtime-dynamic-module/index.ts
diff --git a/zeppelin-web-angular/src/app/core/runtime-dynamic-module/ng-zorro-antd-module.ts b/zeppelin-web/src/app/core/runtime-dynamic-module/ng-zorro-antd-module.ts
similarity index 100%
rename from zeppelin-web-angular/src/app/core/runtime-dynamic-module/ng-zorro-antd-module.ts
rename to zeppelin-web/src/app/core/runtime-dynamic-module/ng-zorro-antd-module.ts
diff --git a/zeppelin-web-angular/src/app/core/runtime-dynamic-module/public-api.ts b/zeppelin-web/src/app/core/runtime-dynamic-module/public-api.ts
similarity index 100%
rename from zeppelin-web-angular/src/app/core/runtime-dynamic-module/public-api.ts
rename to zeppelin-web/src/app/core/runtime-dynamic-module/public-api.ts
diff --git a/zeppelin-web-angular/src/app/core/runtime-dynamic-module/runtime-dynamic-module.module.ts b/zeppelin-web/src/app/core/runtime-dynamic-module/runtime-dynamic-module.module.ts
similarity index 100%
rename from zeppelin-web-angular/src/app/core/runtime-dynamic-module/runtime-dynamic-module.module.ts
rename to zeppelin-web/src/app/core/runtime-dynamic-module/runtime-dynamic-module.module.ts
diff --git a/zeppelin-web-angular/src/app/helium-manager/helium-manager.module.ts b/zeppelin-web/src/app/helium-manager/helium-manager.module.ts
similarity index 100%
rename from zeppelin-web-angular/src/app/helium-manager/helium-manager.module.ts
rename to zeppelin-web/src/app/helium-manager/helium-manager.module.ts
diff --git a/zeppelin-web-angular/src/app/helium-manager/helium-manager.service.ts b/zeppelin-web/src/app/helium-manager/helium-manager.service.ts
similarity index 100%
rename from zeppelin-web-angular/src/app/helium-manager/helium-manager.service.ts
rename to zeppelin-web/src/app/helium-manager/helium-manager.service.ts
diff --git a/zeppelin-web-angular/src/app/helium-manager/index.ts b/zeppelin-web/src/app/helium-manager/index.ts
similarity index 100%
rename from zeppelin-web-angular/src/app/helium-manager/index.ts
rename to zeppelin-web/src/app/helium-manager/index.ts
diff --git a/zeppelin-web-angular/src/app/helium-manager/public-api.ts b/zeppelin-web/src/app/helium-manager/public-api.ts
similarity index 100%
rename from zeppelin-web-angular/src/app/helium-manager/public-api.ts
rename to zeppelin-web/src/app/helium-manager/public-api.ts
diff --git a/zeppelin-web-angular/src/app/interfaces/credential.ts b/zeppelin-web/src/app/interfaces/credential.ts
similarity index 100%
rename from zeppelin-web-angular/src/app/interfaces/credential.ts
rename to zeppelin-web/src/app/interfaces/credential.ts
diff --git a/zeppelin-web-angular/src/app/interfaces/index.ts b/zeppelin-web/src/app/interfaces/index.ts
similarity index 100%
rename from zeppelin-web-angular/src/app/interfaces/index.ts
rename to zeppelin-web/src/app/interfaces/index.ts
diff --git a/zeppelin-web-angular/src/app/interfaces/interpreter.ts b/zeppelin-web/src/app/interfaces/interpreter.ts
similarity index 100%
rename from zeppelin-web-angular/src/app/interfaces/interpreter.ts
rename to zeppelin-web/src/app/interfaces/interpreter.ts
diff --git a/zeppelin-web-angular/src/app/interfaces/message-interceptor.ts b/zeppelin-web/src/app/interfaces/message-interceptor.ts
similarity index 100%
rename from zeppelin-web-angular/src/app/interfaces/message-interceptor.ts
rename to zeppelin-web/src/app/interfaces/message-interceptor.ts
diff --git a/zeppelin-web-angular/src/app/interfaces/node-list.ts b/zeppelin-web/src/app/interfaces/node-list.ts
similarity index 100%
rename from zeppelin-web-angular/src/app/interfaces/node-list.ts
rename to zeppelin-web/src/app/interfaces/node-list.ts
diff --git a/zeppelin-web-angular/src/app/interfaces/notebook-repo.ts b/zeppelin-web/src/app/interfaces/notebook-repo.ts
similarity index 100%
rename from zeppelin-web-angular/src/app/interfaces/notebook-repo.ts
rename to zeppelin-web/src/app/interfaces/notebook-repo.ts
diff --git a/zeppelin-web-angular/src/app/interfaces/notebook-search.ts b/zeppelin-web/src/app/interfaces/notebook-search.ts
similarity index 100%
rename from zeppelin-web-angular/src/app/interfaces/notebook-search.ts
rename to zeppelin-web/src/app/interfaces/notebook-search.ts
diff --git a/zeppelin-web-angular/src/app/interfaces/public-api.ts b/zeppelin-web/src/app/interfaces/public-api.ts
similarity index 100%
rename from zeppelin-web-angular/src/app/interfaces/public-api.ts
rename to zeppelin-web/src/app/interfaces/public-api.ts
diff --git a/zeppelin-web-angular/src/app/interfaces/security.ts b/zeppelin-web/src/app/interfaces/security.ts
similarity index 100%
rename from zeppelin-web-angular/src/app/interfaces/security.ts
rename to zeppelin-web/src/app/interfaces/security.ts
diff --git a/zeppelin-web-angular/src/app/interfaces/ticket.ts b/zeppelin-web/src/app/interfaces/ticket.ts
similarity index 100%
rename from zeppelin-web-angular/src/app/interfaces/ticket.ts
rename to zeppelin-web/src/app/interfaces/ticket.ts
diff --git a/zeppelin-web-angular/src/app/interfaces/trash-folder-id.ts b/zeppelin-web/src/app/interfaces/trash-folder-id.ts
similarity index 100%
rename from zeppelin-web-angular/src/app/interfaces/trash-folder-id.ts
rename to zeppelin-web/src/app/interfaces/trash-folder-id.ts
diff --git a/zeppelin-web-angular/src/app/languages/index.ts b/zeppelin-web/src/app/languages/index.ts
similarity index 100%
rename from zeppelin-web-angular/src/app/languages/index.ts
rename to zeppelin-web/src/app/languages/index.ts
diff --git a/zeppelin-web-angular/src/app/languages/load.ts b/zeppelin-web/src/app/languages/load.ts
similarity index 100%
rename from zeppelin-web-angular/src/app/languages/load.ts
rename to zeppelin-web/src/app/languages/load.ts
diff --git a/zeppelin-web-angular/src/app/languages/public-api.ts b/zeppelin-web/src/app/languages/public-api.ts
similarity index 100%
rename from zeppelin-web-angular/src/app/languages/public-api.ts
rename to zeppelin-web/src/app/languages/public-api.ts
diff --git a/zeppelin-web-angular/src/app/languages/scala.ts b/zeppelin-web/src/app/languages/scala.ts
similarity index 100%
rename from zeppelin-web-angular/src/app/languages/scala.ts
rename to zeppelin-web/src/app/languages/scala.ts
diff --git a/zeppelin-web-angular/src/app/pages/login/login-routing.module.ts b/zeppelin-web/src/app/pages/login/login-routing.module.ts
similarity index 100%
rename from zeppelin-web-angular/src/app/pages/login/login-routing.module.ts
rename to zeppelin-web/src/app/pages/login/login-routing.module.ts
diff --git a/zeppelin-web-angular/src/app/pages/login/login.component.html b/zeppelin-web/src/app/pages/login/login.component.html
similarity index 100%
rename from zeppelin-web-angular/src/app/pages/login/login.component.html
rename to zeppelin-web/src/app/pages/login/login.component.html
diff --git a/zeppelin-web-angular/src/app/pages/login/login.component.less b/zeppelin-web/src/app/pages/login/login.component.less
similarity index 100%
rename from zeppelin-web-angular/src/app/pages/login/login.component.less
rename to zeppelin-web/src/app/pages/login/login.component.less
diff --git a/zeppelin-web-angular/src/app/pages/login/login.component.ts b/zeppelin-web/src/app/pages/login/login.component.ts
similarity index 100%
rename from zeppelin-web-angular/src/app/pages/login/login.component.ts
rename to zeppelin-web/src/app/pages/login/login.component.ts
diff --git a/zeppelin-web-angular/src/app/pages/login/login.module.ts b/zeppelin-web/src/app/pages/login/login.module.ts
similarity index 100%
rename from zeppelin-web-angular/src/app/pages/login/login.module.ts
rename to zeppelin-web/src/app/pages/login/login.module.ts
diff --git a/zeppelin-web-angular/src/app/pages/workspace/configuration/configuration-routing.module.ts b/zeppelin-web/src/app/pages/workspace/configuration/configuration-routing.module.ts
similarity index 100%
rename from zeppelin-web-angular/src/app/pages/workspace/configuration/configuration-routing.module.ts
rename to zeppelin-web/src/app/pages/workspace/configuration/configuration-routing.module.ts
diff --git a/zeppelin-web-angular/src/app/pages/workspace/configuration/configuration.component.html b/zeppelin-web/src/app/pages/workspace/configuration/configuration.component.html
similarity index 100%
rename from zeppelin-web-angular/src/app/pages/workspace/configuration/configuration.component.html
rename to zeppelin-web/src/app/pages/workspace/configuration/configuration.component.html
diff --git a/zeppelin-web-angular/src/app/pages/workspace/configuration/configuration.component.less b/zeppelin-web/src/app/pages/workspace/configuration/configuration.component.less
similarity index 100%
rename from zeppelin-web-angular/src/app/pages/workspace/configuration/configuration.component.less
rename to zeppelin-web/src/app/pages/workspace/configuration/configuration.component.less
diff --git a/zeppelin-web-angular/src/app/pages/workspace/configuration/configuration.component.ts b/zeppelin-web/src/app/pages/workspace/configuration/configuration.component.ts
similarity index 100%
rename from zeppelin-web-angular/src/app/pages/workspace/configuration/configuration.component.ts
rename to zeppelin-web/src/app/pages/workspace/configuration/configuration.component.ts
diff --git a/zeppelin-web-angular/src/app/pages/workspace/configuration/configuration.module.ts b/zeppelin-web/src/app/pages/workspace/configuration/configuration.module.ts
similarity index 100%
rename from zeppelin-web-angular/src/app/pages/workspace/configuration/configuration.module.ts
rename to zeppelin-web/src/app/pages/workspace/configuration/configuration.module.ts
diff --git a/zeppelin-web-angular/src/app/pages/workspace/credential/credential-routing.module.ts b/zeppelin-web/src/app/pages/workspace/credential/credential-routing.module.ts
similarity index 100%
rename from zeppelin-web-angular/src/app/pages/workspace/credential/credential-routing.module.ts
rename to zeppelin-web/src/app/pages/workspace/credential/credential-routing.module.ts
diff --git a/zeppelin-web-angular/src/app/pages/workspace/credential/credential.component.html b/zeppelin-web/src/app/pages/workspace/credential/credential.component.html
similarity index 100%
rename from zeppelin-web-angular/src/app/pages/workspace/credential/credential.component.html
rename to zeppelin-web/src/app/pages/workspace/credential/credential.component.html
diff --git a/zeppelin-web-angular/src/app/pages/workspace/credential/credential.component.less b/zeppelin-web/src/app/pages/workspace/credential/credential.component.less
similarity index 100%
rename from zeppelin-web-angular/src/app/pages/workspace/credential/credential.component.less
rename to zeppelin-web/src/app/pages/workspace/credential/credential.component.less
diff --git a/zeppelin-web-angular/src/app/pages/workspace/credential/credential.component.ts b/zeppelin-web/src/app/pages/workspace/credential/credential.component.ts
similarity index 100%
rename from zeppelin-web-angular/src/app/pages/workspace/credential/credential.component.ts
rename to zeppelin-web/src/app/pages/workspace/credential/credential.component.ts
diff --git a/zeppelin-web-angular/src/app/pages/workspace/credential/credential.module.ts b/zeppelin-web/src/app/pages/workspace/credential/credential.module.ts
similarity index 100%
rename from zeppelin-web-angular/src/app/pages/workspace/credential/credential.module.ts
rename to zeppelin-web/src/app/pages/workspace/credential/credential.module.ts
diff --git a/zeppelin-web-angular/src/app/pages/workspace/home/home-routing.module.ts b/zeppelin-web/src/app/pages/workspace/home/home-routing.module.ts
similarity index 100%
rename from zeppelin-web-angular/src/app/pages/workspace/home/home-routing.module.ts
rename to zeppelin-web/src/app/pages/workspace/home/home-routing.module.ts
diff --git a/zeppelin-web-angular/src/app/pages/workspace/home/home.component.html b/zeppelin-web/src/app/pages/workspace/home/home.component.html
similarity index 100%
rename from zeppelin-web-angular/src/app/pages/workspace/home/home.component.html
rename to zeppelin-web/src/app/pages/workspace/home/home.component.html
diff --git a/zeppelin-web-angular/src/app/pages/workspace/home/home.component.less b/zeppelin-web/src/app/pages/workspace/home/home.component.less
similarity index 100%
rename from zeppelin-web-angular/src/app/pages/workspace/home/home.component.less
rename to zeppelin-web/src/app/pages/workspace/home/home.component.less
diff --git a/zeppelin-web-angular/src/app/pages/workspace/home/home.component.ts b/zeppelin-web/src/app/pages/workspace/home/home.component.ts
similarity index 100%
rename from zeppelin-web-angular/src/app/pages/workspace/home/home.component.ts
rename to zeppelin-web/src/app/pages/workspace/home/home.component.ts
diff --git a/zeppelin-web-angular/src/app/pages/workspace/home/home.module.ts b/zeppelin-web/src/app/pages/workspace/home/home.module.ts
similarity index 100%
rename from zeppelin-web-angular/src/app/pages/workspace/home/home.module.ts
rename to zeppelin-web/src/app/pages/workspace/home/home.module.ts
diff --git a/zeppelin-web-angular/src/app/pages/workspace/interpreter/create-repository-modal/create-repository-modal.component.html b/zeppelin-web/src/app/pages/workspace/interpreter/create-repository-modal/create-repository-modal.component.html
similarity index 100%
rename from zeppelin-web-angular/src/app/pages/workspace/interpreter/create-repository-modal/create-repository-modal.component.html
rename to zeppelin-web/src/app/pages/workspace/interpreter/create-repository-modal/create-repository-modal.component.html
diff --git a/zeppelin-web-angular/src/app/pages/workspace/interpreter/create-repository-modal/create-repository-modal.component.less b/zeppelin-web/src/app/pages/workspace/interpreter/create-repository-modal/create-repository-modal.component.less
similarity index 100%
rename from zeppelin-web-angular/src/app/pages/workspace/interpreter/create-repository-modal/create-repository-modal.component.less
rename to zeppelin-web/src/app/pages/workspace/interpreter/create-repository-modal/create-repository-modal.component.less
diff --git a/zeppelin-web-angular/src/app/pages/workspace/interpreter/create-repository-modal/create-repository-modal.component.ts b/zeppelin-web/src/app/pages/workspace/interpreter/create-repository-modal/create-repository-modal.component.ts
similarity index 100%
rename from zeppelin-web-angular/src/app/pages/workspace/interpreter/create-repository-modal/create-repository-modal.component.ts
rename to zeppelin-web/src/app/pages/workspace/interpreter/create-repository-modal/create-repository-modal.component.ts
diff --git a/zeppelin-web-angular/src/app/pages/workspace/interpreter/interpreter-routing.module.ts b/zeppelin-web/src/app/pages/workspace/interpreter/interpreter-routing.module.ts
similarity index 100%
rename from zeppelin-web-angular/src/app/pages/workspace/interpreter/interpreter-routing.module.ts
rename to zeppelin-web/src/app/pages/workspace/interpreter/interpreter-routing.module.ts
diff --git a/zeppelin-web-angular/src/app/pages/workspace/interpreter/interpreter.component.html b/zeppelin-web/src/app/pages/workspace/interpreter/interpreter.component.html
similarity index 100%
rename from zeppelin-web-angular/src/app/pages/workspace/interpreter/interpreter.component.html
rename to zeppelin-web/src/app/pages/workspace/interpreter/interpreter.component.html
diff --git a/zeppelin-web-angular/src/app/pages/workspace/interpreter/interpreter.component.less b/zeppelin-web/src/app/pages/workspace/interpreter/interpreter.component.less
similarity index 100%
rename from zeppelin-web-angular/src/app/pages/workspace/interpreter/interpreter.component.less
rename to zeppelin-web/src/app/pages/workspace/interpreter/interpreter.component.less
diff --git a/zeppelin-web-angular/src/app/pages/workspace/interpreter/interpreter.component.ts b/zeppelin-web/src/app/pages/workspace/interpreter/interpreter.component.ts
similarity index 100%
rename from zeppelin-web-angular/src/app/pages/workspace/interpreter/interpreter.component.ts
rename to zeppelin-web/src/app/pages/workspace/interpreter/interpreter.component.ts
diff --git a/zeppelin-web-angular/src/app/pages/workspace/interpreter/interpreter.module.ts b/zeppelin-web/src/app/pages/workspace/interpreter/interpreter.module.ts
similarity index 100%
rename from zeppelin-web-angular/src/app/pages/workspace/interpreter/interpreter.module.ts
rename to zeppelin-web/src/app/pages/workspace/interpreter/interpreter.module.ts
diff --git a/zeppelin-web-angular/src/app/pages/workspace/interpreter/item/item.component.html b/zeppelin-web/src/app/pages/workspace/interpreter/item/item.component.html
similarity index 100%
rename from zeppelin-web-angular/src/app/pages/workspace/interpreter/item/item.component.html
rename to zeppelin-web/src/app/pages/workspace/interpreter/item/item.component.html
diff --git a/zeppelin-web-angular/src/app/pages/workspace/interpreter/item/item.component.less b/zeppelin-web/src/app/pages/workspace/interpreter/item/item.component.less
similarity index 100%
rename from zeppelin-web-angular/src/app/pages/workspace/interpreter/item/item.component.less
rename to zeppelin-web/src/app/pages/workspace/interpreter/item/item.component.less
diff --git a/zeppelin-web-angular/src/app/pages/workspace/interpreter/item/item.component.ts b/zeppelin-web/src/app/pages/workspace/interpreter/item/item.component.ts
similarity index 100%
rename from zeppelin-web-angular/src/app/pages/workspace/interpreter/item/item.component.ts
rename to zeppelin-web/src/app/pages/workspace/interpreter/item/item.component.ts
diff --git a/zeppelin-web-angular/src/app/pages/workspace/job-manager/job-manager-routing.module.ts b/zeppelin-web/src/app/pages/workspace/job-manager/job-manager-routing.module.ts
similarity index 100%
rename from zeppelin-web-angular/src/app/pages/workspace/job-manager/job-manager-routing.module.ts
rename to zeppelin-web/src/app/pages/workspace/job-manager/job-manager-routing.module.ts
diff --git a/zeppelin-web-angular/src/app/pages/workspace/job-manager/job-manager.component.html b/zeppelin-web/src/app/pages/workspace/job-manager/job-manager.component.html
similarity index 100%
rename from zeppelin-web-angular/src/app/pages/workspace/job-manager/job-manager.component.html
rename to zeppelin-web/src/app/pages/workspace/job-manager/job-manager.component.html
diff --git a/zeppelin-web-angular/src/app/pages/workspace/job-manager/job-manager.component.less b/zeppelin-web/src/app/pages/workspace/job-manager/job-manager.component.less
similarity index 100%
rename from zeppelin-web-angular/src/app/pages/workspace/job-manager/job-manager.component.less
rename to zeppelin-web/src/app/pages/workspace/job-manager/job-manager.component.less
diff --git a/zeppelin-web-angular/src/app/pages/workspace/job-manager/job-manager.component.ts b/zeppelin-web/src/app/pages/workspace/job-manager/job-manager.component.ts
similarity index 100%
rename from zeppelin-web-angular/src/app/pages/workspace/job-manager/job-manager.component.ts
rename to zeppelin-web/src/app/pages/workspace/job-manager/job-manager.component.ts
diff --git a/zeppelin-web-angular/src/app/pages/workspace/job-manager/job-manager.module.ts b/zeppelin-web/src/app/pages/workspace/job-manager/job-manager.module.ts
similarity index 100%
rename from zeppelin-web-angular/src/app/pages/workspace/job-manager/job-manager.module.ts
rename to zeppelin-web/src/app/pages/workspace/job-manager/job-manager.module.ts
diff --git a/zeppelin-web-angular/src/app/pages/workspace/job-manager/job-status/job-status.component.html b/zeppelin-web/src/app/pages/workspace/job-manager/job-status/job-status.component.html
similarity index 100%
rename from zeppelin-web-angular/src/app/pages/workspace/job-manager/job-status/job-status.component.html
rename to zeppelin-web/src/app/pages/workspace/job-manager/job-status/job-status.component.html
diff --git a/zeppelin-web-angular/src/app/pages/workspace/job-manager/job-status/job-status.component.less b/zeppelin-web/src/app/pages/workspace/job-manager/job-status/job-status.component.less
similarity index 100%
rename from zeppelin-web-angular/src/app/pages/workspace/job-manager/job-status/job-status.component.less
rename to zeppelin-web/src/app/pages/workspace/job-manager/job-status/job-status.component.less
diff --git a/zeppelin-web-angular/src/app/pages/workspace/job-manager/job-status/job-status.component.ts b/zeppelin-web/src/app/pages/workspace/job-manager/job-status/job-status.component.ts
similarity index 100%
rename from zeppelin-web-angular/src/app/pages/workspace/job-manager/job-status/job-status.component.ts
rename to zeppelin-web/src/app/pages/workspace/job-manager/job-status/job-status.component.ts
diff --git a/zeppelin-web-angular/src/app/pages/workspace/job-manager/job/job.component.html b/zeppelin-web/src/app/pages/workspace/job-manager/job/job.component.html
similarity index 100%
rename from zeppelin-web-angular/src/app/pages/workspace/job-manager/job/job.component.html
rename to zeppelin-web/src/app/pages/workspace/job-manager/job/job.component.html
diff --git a/zeppelin-web-angular/src/app/pages/workspace/job-manager/job/job.component.less b/zeppelin-web/src/app/pages/workspace/job-manager/job/job.component.less
similarity index 100%
rename from zeppelin-web-angular/src/app/pages/workspace/job-manager/job/job.component.less
rename to zeppelin-web/src/app/pages/workspace/job-manager/job/job.component.less
diff --git a/zeppelin-web-angular/src/app/pages/workspace/job-manager/job/job.component.ts b/zeppelin-web/src/app/pages/workspace/job-manager/job/job.component.ts
similarity index 100%
rename from zeppelin-web-angular/src/app/pages/workspace/job-manager/job/job.component.ts
rename to zeppelin-web/src/app/pages/workspace/job-manager/job/job.component.ts
diff --git a/zeppelin-web-angular/src/app/pages/workspace/notebook-repos/item/item.component.html b/zeppelin-web/src/app/pages/workspace/notebook-repos/item/item.component.html
similarity index 100%
rename from zeppelin-web-angular/src/app/pages/workspace/notebook-repos/item/item.component.html
rename to zeppelin-web/src/app/pages/workspace/notebook-repos/item/item.component.html
diff --git a/zeppelin-web-angular/src/app/pages/workspace/notebook-repos/item/item.component.less b/zeppelin-web/src/app/pages/workspace/notebook-repos/item/item.component.less
similarity index 100%
rename from zeppelin-web-angular/src/app/pages/workspace/notebook-repos/item/item.component.less
rename to zeppelin-web/src/app/pages/workspace/notebook-repos/item/item.component.less
diff --git a/zeppelin-web-angular/src/app/pages/workspace/notebook-repos/item/item.component.ts b/zeppelin-web/src/app/pages/workspace/notebook-repos/item/item.component.ts
similarity index 100%
rename from zeppelin-web-angular/src/app/pages/workspace/notebook-repos/item/item.component.ts
rename to zeppelin-web/src/app/pages/workspace/notebook-repos/item/item.component.ts
diff --git a/zeppelin-web-angular/src/app/pages/workspace/notebook-repos/notebook-repos-routing.module.ts b/zeppelin-web/src/app/pages/workspace/notebook-repos/notebook-repos-routing.module.ts
similarity index 100%
rename from zeppelin-web-angular/src/app/pages/workspace/notebook-repos/notebook-repos-routing.module.ts
rename to zeppelin-web/src/app/pages/workspace/notebook-repos/notebook-repos-routing.module.ts
diff --git a/zeppelin-web-angular/src/app/pages/workspace/notebook-repos/notebook-repos.component.html b/zeppelin-web/src/app/pages/workspace/notebook-repos/notebook-repos.component.html
similarity index 100%
rename from zeppelin-web-angular/src/app/pages/workspace/notebook-repos/notebook-repos.component.html
rename to zeppelin-web/src/app/pages/workspace/notebook-repos/notebook-repos.component.html
diff --git a/zeppelin-web-angular/src/app/pages/workspace/notebook-repos/notebook-repos.component.less b/zeppelin-web/src/app/pages/workspace/notebook-repos/notebook-repos.component.less
similarity index 100%
rename from zeppelin-web-angular/src/app/pages/workspace/notebook-repos/notebook-repos.component.less
rename to zeppelin-web/src/app/pages/workspace/notebook-repos/notebook-repos.component.less
diff --git a/zeppelin-web-angular/src/app/pages/workspace/notebook-repos/notebook-repos.component.ts b/zeppelin-web/src/app/pages/workspace/notebook-repos/notebook-repos.component.ts
similarity index 100%
rename from zeppelin-web-angular/src/app/pages/workspace/notebook-repos/notebook-repos.component.ts
rename to zeppelin-web/src/app/pages/workspace/notebook-repos/notebook-repos.component.ts
diff --git a/zeppelin-web-angular/src/app/pages/workspace/notebook-repos/notebook-repos.module.ts b/zeppelin-web/src/app/pages/workspace/notebook-repos/notebook-repos.module.ts
similarity index 100%
rename from zeppelin-web-angular/src/app/pages/workspace/notebook-repos/notebook-repos.module.ts
rename to zeppelin-web/src/app/pages/workspace/notebook-repos/notebook-repos.module.ts
diff --git a/zeppelin-web-angular/src/app/pages/workspace/notebook-search/notebook-search-routing.module.ts b/zeppelin-web/src/app/pages/workspace/notebook-search/notebook-search-routing.module.ts
similarity index 100%
rename from zeppelin-web-angular/src/app/pages/workspace/notebook-search/notebook-search-routing.module.ts
rename to zeppelin-web/src/app/pages/workspace/notebook-search/notebook-search-routing.module.ts
diff --git a/zeppelin-web-angular/src/app/pages/workspace/notebook-search/notebook-search.component.html b/zeppelin-web/src/app/pages/workspace/notebook-search/notebook-search.component.html
similarity index 100%
rename from zeppelin-web-angular/src/app/pages/workspace/notebook-search/notebook-search.component.html
rename to zeppelin-web/src/app/pages/workspace/notebook-search/notebook-search.component.html
diff --git a/zeppelin-web-angular/src/app/pages/workspace/notebook-search/notebook-search.component.less b/zeppelin-web/src/app/pages/workspace/notebook-search/notebook-search.component.less
similarity index 100%
rename from zeppelin-web-angular/src/app/pages/workspace/notebook-search/notebook-search.component.less
rename to zeppelin-web/src/app/pages/workspace/notebook-search/notebook-search.component.less
diff --git a/zeppelin-web-angular/src/app/pages/workspace/notebook-search/notebook-search.component.ts b/zeppelin-web/src/app/pages/workspace/notebook-search/notebook-search.component.ts
similarity index 100%
rename from zeppelin-web-angular/src/app/pages/workspace/notebook-search/notebook-search.component.ts
rename to zeppelin-web/src/app/pages/workspace/notebook-search/notebook-search.component.ts
diff --git a/zeppelin-web-angular/src/app/pages/workspace/notebook-search/notebook-search.module.ts b/zeppelin-web/src/app/pages/workspace/notebook-search/notebook-search.module.ts
similarity index 100%
rename from zeppelin-web-angular/src/app/pages/workspace/notebook-search/notebook-search.module.ts
rename to zeppelin-web/src/app/pages/workspace/notebook-search/notebook-search.module.ts
diff --git a/zeppelin-web-angular/src/app/pages/workspace/notebook-search/result-item/result-item.component.html b/zeppelin-web/src/app/pages/workspace/notebook-search/result-item/result-item.component.html
similarity index 100%
rename from zeppelin-web-angular/src/app/pages/workspace/notebook-search/result-item/result-item.component.html
rename to zeppelin-web/src/app/pages/workspace/notebook-search/result-item/result-item.component.html
diff --git a/zeppelin-web-angular/src/app/pages/workspace/notebook-search/result-item/result-item.component.less b/zeppelin-web/src/app/pages/workspace/notebook-search/result-item/result-item.component.less
similarity index 100%
rename from zeppelin-web-angular/src/app/pages/workspace/notebook-search/result-item/result-item.component.less
rename to zeppelin-web/src/app/pages/workspace/notebook-search/result-item/result-item.component.less
diff --git a/zeppelin-web-angular/src/app/pages/workspace/notebook-search/result-item/result-item.component.ts b/zeppelin-web/src/app/pages/workspace/notebook-search/result-item/result-item.component.ts
similarity index 100%
rename from zeppelin-web-angular/src/app/pages/workspace/notebook-search/result-item/result-item.component.ts
rename to zeppelin-web/src/app/pages/workspace/notebook-search/result-item/result-item.component.ts
diff --git a/zeppelin-web-angular/src/app/pages/workspace/notebook/action-bar/action-bar.component.html b/zeppelin-web/src/app/pages/workspace/notebook/action-bar/action-bar.component.html
similarity index 100%
rename from zeppelin-web-angular/src/app/pages/workspace/notebook/action-bar/action-bar.component.html
rename to zeppelin-web/src/app/pages/workspace/notebook/action-bar/action-bar.component.html
diff --git a/zeppelin-web-angular/src/app/pages/workspace/notebook/action-bar/action-bar.component.less b/zeppelin-web/src/app/pages/workspace/notebook/action-bar/action-bar.component.less
similarity index 100%
rename from zeppelin-web-angular/src/app/pages/workspace/notebook/action-bar/action-bar.component.less
rename to zeppelin-web/src/app/pages/workspace/notebook/action-bar/action-bar.component.less
diff --git a/zeppelin-web-angular/src/app/pages/workspace/notebook/action-bar/action-bar.component.ts b/zeppelin-web/src/app/pages/workspace/notebook/action-bar/action-bar.component.ts
similarity index 100%
rename from zeppelin-web-angular/src/app/pages/workspace/notebook/action-bar/action-bar.component.ts
rename to zeppelin-web/src/app/pages/workspace/notebook/action-bar/action-bar.component.ts
diff --git a/zeppelin-web-angular/src/app/pages/workspace/notebook/add-paragraph/add-paragraph.component.html b/zeppelin-web/src/app/pages/workspace/notebook/add-paragraph/add-paragraph.component.html
similarity index 100%
rename from zeppelin-web-angular/src/app/pages/workspace/notebook/add-paragraph/add-paragraph.component.html
rename to zeppelin-web/src/app/pages/workspace/notebook/add-paragraph/add-paragraph.component.html
diff --git a/zeppelin-web-angular/src/app/pages/workspace/notebook/add-paragraph/add-paragraph.component.less b/zeppelin-web/src/app/pages/workspace/notebook/add-paragraph/add-paragraph.component.less
similarity index 100%
rename from zeppelin-web-angular/src/app/pages/workspace/notebook/add-paragraph/add-paragraph.component.less
rename to zeppelin-web/src/app/pages/workspace/notebook/add-paragraph/add-paragraph.component.less
diff --git a/zeppelin-web-angular/src/app/pages/workspace/notebook/add-paragraph/add-paragraph.component.ts b/zeppelin-web/src/app/pages/workspace/notebook/add-paragraph/add-paragraph.component.ts
similarity index 100%
rename from zeppelin-web-angular/src/app/pages/workspace/notebook/add-paragraph/add-paragraph.component.ts
rename to zeppelin-web/src/app/pages/workspace/notebook/add-paragraph/add-paragraph.component.ts
diff --git a/zeppelin-web-angular/src/app/pages/workspace/notebook/interpreter-binding/interpreter-binding.component.html b/zeppelin-web/src/app/pages/workspace/notebook/interpreter-binding/interpreter-binding.component.html
similarity index 100%
rename from zeppelin-web-angular/src/app/pages/workspace/notebook/interpreter-binding/interpreter-binding.component.html
rename to zeppelin-web/src/app/pages/workspace/notebook/interpreter-binding/interpreter-binding.component.html
diff --git a/zeppelin-web-angular/src/app/pages/workspace/notebook/interpreter-binding/interpreter-binding.component.less b/zeppelin-web/src/app/pages/workspace/notebook/interpreter-binding/interpreter-binding.component.less
similarity index 100%
rename from zeppelin-web-angular/src/app/pages/workspace/notebook/interpreter-binding/interpreter-binding.component.less
rename to zeppelin-web/src/app/pages/workspace/notebook/interpreter-binding/interpreter-binding.component.less
diff --git a/zeppelin-web-angular/src/app/pages/workspace/notebook/interpreter-binding/interpreter-binding.component.ts b/zeppelin-web/src/app/pages/workspace/notebook/interpreter-binding/interpreter-binding.component.ts
similarity index 100%
rename from zeppelin-web-angular/src/app/pages/workspace/notebook/interpreter-binding/interpreter-binding.component.ts
rename to zeppelin-web/src/app/pages/workspace/notebook/interpreter-binding/interpreter-binding.component.ts
diff --git a/zeppelin-web-angular/src/app/pages/workspace/notebook/note-form-block/note-form-block.component.html b/zeppelin-web/src/app/pages/workspace/notebook/note-form-block/note-form-block.component.html
similarity index 100%
rename from zeppelin-web-angular/src/app/pages/workspace/notebook/note-form-block/note-form-block.component.html
rename to zeppelin-web/src/app/pages/workspace/notebook/note-form-block/note-form-block.component.html
diff --git a/zeppelin-web-angular/src/app/pages/workspace/notebook/note-form-block/note-form-block.component.less b/zeppelin-web/src/app/pages/workspace/notebook/note-form-block/note-form-block.component.less
similarity index 100%
rename from zeppelin-web-angular/src/app/pages/workspace/notebook/note-form-block/note-form-block.component.less
rename to zeppelin-web/src/app/pages/workspace/notebook/note-form-block/note-form-block.component.less
diff --git a/zeppelin-web-angular/src/app/pages/workspace/notebook/note-form-block/note-form-block.component.ts b/zeppelin-web/src/app/pages/workspace/notebook/note-form-block/note-form-block.component.ts
similarity index 100%
rename from zeppelin-web-angular/src/app/pages/workspace/notebook/note-form-block/note-form-block.component.ts
rename to zeppelin-web/src/app/pages/workspace/notebook/note-form-block/note-form-block.component.ts
diff --git a/zeppelin-web-angular/src/app/pages/workspace/notebook/notebook-routing.module.ts b/zeppelin-web/src/app/pages/workspace/notebook/notebook-routing.module.ts
similarity index 100%
rename from zeppelin-web-angular/src/app/pages/workspace/notebook/notebook-routing.module.ts
rename to zeppelin-web/src/app/pages/workspace/notebook/notebook-routing.module.ts
diff --git a/zeppelin-web-angular/src/app/pages/workspace/notebook/notebook.component.html b/zeppelin-web/src/app/pages/workspace/notebook/notebook.component.html
similarity index 100%
rename from zeppelin-web-angular/src/app/pages/workspace/notebook/notebook.component.html
rename to zeppelin-web/src/app/pages/workspace/notebook/notebook.component.html
diff --git a/zeppelin-web-angular/src/app/pages/workspace/notebook/notebook.component.less b/zeppelin-web/src/app/pages/workspace/notebook/notebook.component.less
similarity index 100%
rename from zeppelin-web-angular/src/app/pages/workspace/notebook/notebook.component.less
rename to zeppelin-web/src/app/pages/workspace/notebook/notebook.component.less
diff --git a/zeppelin-web-angular/src/app/pages/workspace/notebook/notebook.component.ts b/zeppelin-web/src/app/pages/workspace/notebook/notebook.component.ts
similarity index 100%
rename from zeppelin-web-angular/src/app/pages/workspace/notebook/notebook.component.ts
rename to zeppelin-web/src/app/pages/workspace/notebook/notebook.component.ts
diff --git a/zeppelin-web-angular/src/app/pages/workspace/notebook/notebook.module.ts b/zeppelin-web/src/app/pages/workspace/notebook/notebook.module.ts
similarity index 100%
rename from zeppelin-web-angular/src/app/pages/workspace/notebook/notebook.module.ts
rename to zeppelin-web/src/app/pages/workspace/notebook/notebook.module.ts
diff --git a/zeppelin-web-angular/src/app/pages/workspace/notebook/paragraph/code-editor/code-editor.component.html b/zeppelin-web/src/app/pages/workspace/notebook/paragraph/code-editor/code-editor.component.html
similarity index 100%
rename from zeppelin-web-angular/src/app/pages/workspace/notebook/paragraph/code-editor/code-editor.component.html
rename to zeppelin-web/src/app/pages/workspace/notebook/paragraph/code-editor/code-editor.component.html
diff --git a/zeppelin-web-angular/src/app/pages/workspace/notebook/paragraph/code-editor/code-editor.component.less b/zeppelin-web/src/app/pages/workspace/notebook/paragraph/code-editor/code-editor.component.less
similarity index 100%
rename from zeppelin-web-angular/src/app/pages/workspace/notebook/paragraph/code-editor/code-editor.component.less
rename to zeppelin-web/src/app/pages/workspace/notebook/paragraph/code-editor/code-editor.component.less
diff --git a/zeppelin-web-angular/src/app/pages/workspace/notebook/paragraph/code-editor/code-editor.component.ts b/zeppelin-web/src/app/pages/workspace/notebook/paragraph/code-editor/code-editor.component.ts
similarity index 100%
rename from zeppelin-web-angular/src/app/pages/workspace/notebook/paragraph/code-editor/code-editor.component.ts
rename to zeppelin-web/src/app/pages/workspace/notebook/paragraph/code-editor/code-editor.component.ts
diff --git a/zeppelin-web-angular/src/app/pages/workspace/notebook/paragraph/control/control.component.html b/zeppelin-web/src/app/pages/workspace/notebook/paragraph/control/control.component.html
similarity index 100%
rename from zeppelin-web-angular/src/app/pages/workspace/notebook/paragraph/control/control.component.html
rename to zeppelin-web/src/app/pages/workspace/notebook/paragraph/control/control.component.html
diff --git a/zeppelin-web-angular/src/app/pages/workspace/notebook/paragraph/control/control.component.less b/zeppelin-web/src/app/pages/workspace/notebook/paragraph/control/control.component.less
similarity index 100%
rename from zeppelin-web-angular/src/app/pages/workspace/notebook/paragraph/control/control.component.less
rename to zeppelin-web/src/app/pages/workspace/notebook/paragraph/control/control.component.less
diff --git a/zeppelin-web-angular/src/app/pages/workspace/notebook/paragraph/control/control.component.ts b/zeppelin-web/src/app/pages/workspace/notebook/paragraph/control/control.component.ts
similarity index 100%
rename from zeppelin-web-angular/src/app/pages/workspace/notebook/paragraph/control/control.component.ts
rename to zeppelin-web/src/app/pages/workspace/notebook/paragraph/control/control.component.ts
diff --git a/zeppelin-web-angular/src/app/pages/workspace/notebook/paragraph/footer/footer.component.html b/zeppelin-web/src/app/pages/workspace/notebook/paragraph/footer/footer.component.html
similarity index 100%
rename from zeppelin-web-angular/src/app/pages/workspace/notebook/paragraph/footer/footer.component.html
rename to zeppelin-web/src/app/pages/workspace/notebook/paragraph/footer/footer.component.html
diff --git a/zeppelin-web-angular/src/app/pages/workspace/notebook/paragraph/footer/footer.component.less b/zeppelin-web/src/app/pages/workspace/notebook/paragraph/footer/footer.component.less
similarity index 100%
rename from zeppelin-web-angular/src/app/pages/workspace/notebook/paragraph/footer/footer.component.less
rename to zeppelin-web/src/app/pages/workspace/notebook/paragraph/footer/footer.component.less
diff --git a/zeppelin-web-angular/src/app/pages/workspace/notebook/paragraph/footer/footer.component.ts b/zeppelin-web/src/app/pages/workspace/notebook/paragraph/footer/footer.component.ts
similarity index 100%
rename from zeppelin-web-angular/src/app/pages/workspace/notebook/paragraph/footer/footer.component.ts
rename to zeppelin-web/src/app/pages/workspace/notebook/paragraph/footer/footer.component.ts
diff --git a/zeppelin-web-angular/src/app/pages/workspace/notebook/paragraph/paragraph.component.html b/zeppelin-web/src/app/pages/workspace/notebook/paragraph/paragraph.component.html
similarity index 100%
rename from zeppelin-web-angular/src/app/pages/workspace/notebook/paragraph/paragraph.component.html
rename to zeppelin-web/src/app/pages/workspace/notebook/paragraph/paragraph.component.html
diff --git a/zeppelin-web-angular/src/app/pages/workspace/notebook/paragraph/paragraph.component.less b/zeppelin-web/src/app/pages/workspace/notebook/paragraph/paragraph.component.less
similarity index 100%
rename from zeppelin-web-angular/src/app/pages/workspace/notebook/paragraph/paragraph.component.less
rename to zeppelin-web/src/app/pages/workspace/notebook/paragraph/paragraph.component.less
diff --git a/zeppelin-web-angular/src/app/pages/workspace/notebook/paragraph/paragraph.component.ts b/zeppelin-web/src/app/pages/workspace/notebook/paragraph/paragraph.component.ts
similarity index 100%
rename from zeppelin-web-angular/src/app/pages/workspace/notebook/paragraph/paragraph.component.ts
rename to zeppelin-web/src/app/pages/workspace/notebook/paragraph/paragraph.component.ts
diff --git a/zeppelin-web-angular/src/app/pages/workspace/notebook/paragraph/progress/progress.component.html b/zeppelin-web/src/app/pages/workspace/notebook/paragraph/progress/progress.component.html
similarity index 100%
rename from zeppelin-web-angular/src/app/pages/workspace/notebook/paragraph/progress/progress.component.html
rename to zeppelin-web/src/app/pages/workspace/notebook/paragraph/progress/progress.component.html
diff --git a/zeppelin-web-angular/src/app/pages/workspace/notebook/paragraph/progress/progress.component.less b/zeppelin-web/src/app/pages/workspace/notebook/paragraph/progress/progress.component.less
similarity index 100%
rename from zeppelin-web-angular/src/app/pages/workspace/notebook/paragraph/progress/progress.component.less
rename to zeppelin-web/src/app/pages/workspace/notebook/paragraph/progress/progress.component.less
diff --git a/zeppelin-web-angular/src/app/pages/workspace/notebook/paragraph/progress/progress.component.ts b/zeppelin-web/src/app/pages/workspace/notebook/paragraph/progress/progress.component.ts
similarity index 100%
rename from zeppelin-web-angular/src/app/pages/workspace/notebook/paragraph/progress/progress.component.ts
rename to zeppelin-web/src/app/pages/workspace/notebook/paragraph/progress/progress.component.ts
diff --git a/zeppelin-web-angular/src/app/pages/workspace/notebook/permissions/permissions.component.html b/zeppelin-web/src/app/pages/workspace/notebook/permissions/permissions.component.html
similarity index 100%
rename from zeppelin-web-angular/src/app/pages/workspace/notebook/permissions/permissions.component.html
rename to zeppelin-web/src/app/pages/workspace/notebook/permissions/permissions.component.html
diff --git a/zeppelin-web-angular/src/app/pages/workspace/notebook/permissions/permissions.component.less b/zeppelin-web/src/app/pages/workspace/notebook/permissions/permissions.component.less
similarity index 100%
rename from zeppelin-web-angular/src/app/pages/workspace/notebook/permissions/permissions.component.less
rename to zeppelin-web/src/app/pages/workspace/notebook/permissions/permissions.component.less
diff --git a/zeppelin-web-angular/src/app/pages/workspace/notebook/permissions/permissions.component.ts b/zeppelin-web/src/app/pages/workspace/notebook/permissions/permissions.component.ts
similarity index 100%
rename from zeppelin-web-angular/src/app/pages/workspace/notebook/permissions/permissions.component.ts
rename to zeppelin-web/src/app/pages/workspace/notebook/permissions/permissions.component.ts
diff --git a/zeppelin-web-angular/src/app/pages/workspace/notebook/revisions-comparator/revisions-comparator.component.html b/zeppelin-web/src/app/pages/workspace/notebook/revisions-comparator/revisions-comparator.component.html
similarity index 100%
rename from zeppelin-web-angular/src/app/pages/workspace/notebook/revisions-comparator/revisions-comparator.component.html
rename to zeppelin-web/src/app/pages/workspace/notebook/revisions-comparator/revisions-comparator.component.html
diff --git a/zeppelin-web-angular/src/app/pages/workspace/notebook/revisions-comparator/revisions-comparator.component.less b/zeppelin-web/src/app/pages/workspace/notebook/revisions-comparator/revisions-comparator.component.less
similarity index 100%
rename from zeppelin-web-angular/src/app/pages/workspace/notebook/revisions-comparator/revisions-comparator.component.less
rename to zeppelin-web/src/app/pages/workspace/notebook/revisions-comparator/revisions-comparator.component.less
diff --git a/zeppelin-web-angular/src/app/pages/workspace/notebook/revisions-comparator/revisions-comparator.component.ts b/zeppelin-web/src/app/pages/workspace/notebook/revisions-comparator/revisions-comparator.component.ts
similarity index 100%
rename from zeppelin-web-angular/src/app/pages/workspace/notebook/revisions-comparator/revisions-comparator.component.ts
rename to zeppelin-web/src/app/pages/workspace/notebook/revisions-comparator/revisions-comparator.component.ts
diff --git a/zeppelin-web-angular/src/app/pages/workspace/notebook/share/elastic-input/elastic-input.component.html b/zeppelin-web/src/app/pages/workspace/notebook/share/elastic-input/elastic-input.component.html
similarity index 100%
rename from zeppelin-web-angular/src/app/pages/workspace/notebook/share/elastic-input/elastic-input.component.html
rename to zeppelin-web/src/app/pages/workspace/notebook/share/elastic-input/elastic-input.component.html
diff --git a/zeppelin-web-angular/src/app/pages/workspace/notebook/share/elastic-input/elastic-input.component.less b/zeppelin-web/src/app/pages/workspace/notebook/share/elastic-input/elastic-input.component.less
similarity index 100%
rename from zeppelin-web-angular/src/app/pages/workspace/notebook/share/elastic-input/elastic-input.component.less
rename to zeppelin-web/src/app/pages/workspace/notebook/share/elastic-input/elastic-input.component.less
diff --git a/zeppelin-web-angular/src/app/pages/workspace/notebook/share/elastic-input/elastic-input.component.ts b/zeppelin-web/src/app/pages/workspace/notebook/share/elastic-input/elastic-input.component.ts
similarity index 100%
rename from zeppelin-web-angular/src/app/pages/workspace/notebook/share/elastic-input/elastic-input.component.ts
rename to zeppelin-web/src/app/pages/workspace/notebook/share/elastic-input/elastic-input.component.ts
diff --git a/zeppelin-web-angular/src/app/pages/workspace/notebook/share/share.module.ts b/zeppelin-web/src/app/pages/workspace/notebook/share/share.module.ts
similarity index 100%
rename from zeppelin-web-angular/src/app/pages/workspace/notebook/share/share.module.ts
rename to zeppelin-web/src/app/pages/workspace/notebook/share/share.module.ts
diff --git a/zeppelin-web-angular/src/app/pages/workspace/notebook/sidebar/sidebar.component.html b/zeppelin-web/src/app/pages/workspace/notebook/sidebar/sidebar.component.html
similarity index 100%
rename from zeppelin-web-angular/src/app/pages/workspace/notebook/sidebar/sidebar.component.html
rename to zeppelin-web/src/app/pages/workspace/notebook/sidebar/sidebar.component.html
diff --git a/zeppelin-web-angular/src/app/pages/workspace/notebook/sidebar/sidebar.component.less b/zeppelin-web/src/app/pages/workspace/notebook/sidebar/sidebar.component.less
similarity index 100%
rename from zeppelin-web-angular/src/app/pages/workspace/notebook/sidebar/sidebar.component.less
rename to zeppelin-web/src/app/pages/workspace/notebook/sidebar/sidebar.component.less
diff --git a/zeppelin-web-angular/src/app/pages/workspace/notebook/sidebar/sidebar.component.ts b/zeppelin-web/src/app/pages/workspace/notebook/sidebar/sidebar.component.ts
similarity index 100%
rename from zeppelin-web-angular/src/app/pages/workspace/notebook/sidebar/sidebar.component.ts
rename to zeppelin-web/src/app/pages/workspace/notebook/sidebar/sidebar.component.ts
diff --git a/zeppelin-web-angular/src/app/pages/workspace/published/paragraph/paragraph.component.html b/zeppelin-web/src/app/pages/workspace/published/paragraph/paragraph.component.html
similarity index 100%
rename from zeppelin-web-angular/src/app/pages/workspace/published/paragraph/paragraph.component.html
rename to zeppelin-web/src/app/pages/workspace/published/paragraph/paragraph.component.html
diff --git a/zeppelin-web-angular/src/app/pages/workspace/published/paragraph/paragraph.component.less b/zeppelin-web/src/app/pages/workspace/published/paragraph/paragraph.component.less
similarity index 100%
rename from zeppelin-web-angular/src/app/pages/workspace/published/paragraph/paragraph.component.less
rename to zeppelin-web/src/app/pages/workspace/published/paragraph/paragraph.component.less
diff --git a/zeppelin-web-angular/src/app/pages/workspace/published/paragraph/paragraph.component.ts b/zeppelin-web/src/app/pages/workspace/published/paragraph/paragraph.component.ts
similarity index 100%
rename from zeppelin-web-angular/src/app/pages/workspace/published/paragraph/paragraph.component.ts
rename to zeppelin-web/src/app/pages/workspace/published/paragraph/paragraph.component.ts
diff --git a/zeppelin-web-angular/src/app/pages/workspace/published/published-ruoting.module.ts b/zeppelin-web/src/app/pages/workspace/published/published-ruoting.module.ts
similarity index 100%
rename from zeppelin-web-angular/src/app/pages/workspace/published/published-ruoting.module.ts
rename to zeppelin-web/src/app/pages/workspace/published/published-ruoting.module.ts
diff --git a/zeppelin-web-angular/src/app/pages/workspace/published/published.module.ts b/zeppelin-web/src/app/pages/workspace/published/published.module.ts
similarity index 100%
rename from zeppelin-web-angular/src/app/pages/workspace/published/published.module.ts
rename to zeppelin-web/src/app/pages/workspace/published/published.module.ts
diff --git a/zeppelin-web-angular/src/app/pages/workspace/share/dynamic-forms/dynamic-forms.component.html b/zeppelin-web/src/app/pages/workspace/share/dynamic-forms/dynamic-forms.component.html
similarity index 100%
rename from zeppelin-web-angular/src/app/pages/workspace/share/dynamic-forms/dynamic-forms.component.html
rename to zeppelin-web/src/app/pages/workspace/share/dynamic-forms/dynamic-forms.component.html
diff --git a/zeppelin-web-angular/src/app/pages/workspace/share/dynamic-forms/dynamic-forms.component.less b/zeppelin-web/src/app/pages/workspace/share/dynamic-forms/dynamic-forms.component.less
similarity index 100%
rename from zeppelin-web-angular/src/app/pages/workspace/share/dynamic-forms/dynamic-forms.component.less
rename to zeppelin-web/src/app/pages/workspace/share/dynamic-forms/dynamic-forms.component.less
diff --git a/zeppelin-web-angular/src/app/pages/workspace/share/dynamic-forms/dynamic-forms.component.ts b/zeppelin-web/src/app/pages/workspace/share/dynamic-forms/dynamic-forms.component.ts
similarity index 100%
rename from zeppelin-web-angular/src/app/pages/workspace/share/dynamic-forms/dynamic-forms.component.ts
rename to zeppelin-web/src/app/pages/workspace/share/dynamic-forms/dynamic-forms.component.ts
diff --git a/zeppelin-web-angular/src/app/pages/workspace/share/index.ts b/zeppelin-web/src/app/pages/workspace/share/index.ts
similarity index 100%
rename from zeppelin-web-angular/src/app/pages/workspace/share/index.ts
rename to zeppelin-web/src/app/pages/workspace/share/index.ts
diff --git a/zeppelin-web-angular/src/app/pages/workspace/share/public-api.ts b/zeppelin-web/src/app/pages/workspace/share/public-api.ts
similarity index 100%
rename from zeppelin-web-angular/src/app/pages/workspace/share/public-api.ts
rename to zeppelin-web/src/app/pages/workspace/share/public-api.ts
diff --git a/zeppelin-web-angular/src/app/pages/workspace/share/result/result.component.html b/zeppelin-web/src/app/pages/workspace/share/result/result.component.html
similarity index 100%
rename from zeppelin-web-angular/src/app/pages/workspace/share/result/result.component.html
rename to zeppelin-web/src/app/pages/workspace/share/result/result.component.html
diff --git a/zeppelin-web-angular/src/app/pages/workspace/share/result/result.component.less b/zeppelin-web/src/app/pages/workspace/share/result/result.component.less
similarity index 100%
rename from zeppelin-web-angular/src/app/pages/workspace/share/result/result.component.less
rename to zeppelin-web/src/app/pages/workspace/share/result/result.component.less
diff --git a/zeppelin-web-angular/src/app/pages/workspace/share/result/result.component.ts b/zeppelin-web/src/app/pages/workspace/share/result/result.component.ts
similarity index 100%
rename from zeppelin-web-angular/src/app/pages/workspace/share/result/result.component.ts
rename to zeppelin-web/src/app/pages/workspace/share/result/result.component.ts
diff --git a/zeppelin-web-angular/src/app/pages/workspace/share/share.module.ts b/zeppelin-web/src/app/pages/workspace/share/share.module.ts
similarity index 100%
rename from zeppelin-web-angular/src/app/pages/workspace/share/share.module.ts
rename to zeppelin-web/src/app/pages/workspace/share/share.module.ts
diff --git a/zeppelin-web-angular/src/app/pages/workspace/workspace-routing.module.ts b/zeppelin-web/src/app/pages/workspace/workspace-routing.module.ts
similarity index 100%
rename from zeppelin-web-angular/src/app/pages/workspace/workspace-routing.module.ts
rename to zeppelin-web/src/app/pages/workspace/workspace-routing.module.ts
diff --git a/zeppelin-web-angular/src/app/pages/workspace/workspace.component.html b/zeppelin-web/src/app/pages/workspace/workspace.component.html
similarity index 100%
rename from zeppelin-web-angular/src/app/pages/workspace/workspace.component.html
rename to zeppelin-web/src/app/pages/workspace/workspace.component.html
diff --git a/zeppelin-web-angular/src/app/pages/workspace/workspace.component.less b/zeppelin-web/src/app/pages/workspace/workspace.component.less
similarity index 100%
rename from zeppelin-web-angular/src/app/pages/workspace/workspace.component.less
rename to zeppelin-web/src/app/pages/workspace/workspace.component.less
diff --git a/zeppelin-web-angular/src/app/pages/workspace/workspace.component.ts b/zeppelin-web/src/app/pages/workspace/workspace.component.ts
similarity index 100%
rename from zeppelin-web-angular/src/app/pages/workspace/workspace.component.ts
rename to zeppelin-web/src/app/pages/workspace/workspace.component.ts
diff --git a/zeppelin-web-angular/src/app/pages/workspace/workspace.guard.ts b/zeppelin-web/src/app/pages/workspace/workspace.guard.ts
similarity index 100%
rename from zeppelin-web-angular/src/app/pages/workspace/workspace.guard.ts
rename to zeppelin-web/src/app/pages/workspace/workspace.guard.ts
diff --git a/zeppelin-web-angular/src/app/pages/workspace/workspace.module.ts b/zeppelin-web/src/app/pages/workspace/workspace.module.ts
similarity index 100%
rename from zeppelin-web-angular/src/app/pages/workspace/workspace.module.ts
rename to zeppelin-web/src/app/pages/workspace/workspace.module.ts
diff --git a/zeppelin-web-angular/src/app/services/array-ordering.service.ts b/zeppelin-web/src/app/services/array-ordering.service.ts
similarity index 100%
rename from zeppelin-web-angular/src/app/services/array-ordering.service.ts
rename to zeppelin-web/src/app/services/array-ordering.service.ts
diff --git a/zeppelin-web-angular/src/app/services/base-rest.ts b/zeppelin-web/src/app/services/base-rest.ts
similarity index 100%
rename from zeppelin-web-angular/src/app/services/base-rest.ts
rename to zeppelin-web/src/app/services/base-rest.ts
diff --git a/zeppelin-web-angular/src/app/services/base-url.service.ts b/zeppelin-web/src/app/services/base-url.service.ts
similarity index 100%
rename from zeppelin-web-angular/src/app/services/base-url.service.ts
rename to zeppelin-web/src/app/services/base-url.service.ts
diff --git a/zeppelin-web-angular/src/app/services/completion.service.ts b/zeppelin-web/src/app/services/completion.service.ts
similarity index 100%
rename from zeppelin-web-angular/src/app/services/completion.service.ts
rename to zeppelin-web/src/app/services/completion.service.ts
diff --git a/zeppelin-web-angular/src/app/services/configuration.service.ts b/zeppelin-web/src/app/services/configuration.service.ts
similarity index 100%
rename from zeppelin-web-angular/src/app/services/configuration.service.ts
rename to zeppelin-web/src/app/services/configuration.service.ts
diff --git a/zeppelin-web-angular/src/app/services/credential.service.ts b/zeppelin-web/src/app/services/credential.service.ts
similarity index 100%
rename from zeppelin-web-angular/src/app/services/credential.service.ts
rename to zeppelin-web/src/app/services/credential.service.ts
diff --git a/zeppelin-web-angular/src/app/services/helium.service.ts b/zeppelin-web/src/app/services/helium.service.ts
similarity index 100%
rename from zeppelin-web-angular/src/app/services/helium.service.ts
rename to zeppelin-web/src/app/services/helium.service.ts
diff --git a/zeppelin-web-angular/src/app/services/index.ts b/zeppelin-web/src/app/services/index.ts
similarity index 100%
rename from zeppelin-web-angular/src/app/services/index.ts
rename to zeppelin-web/src/app/services/index.ts
diff --git a/zeppelin-web-angular/src/app/services/interpreter.service.ts b/zeppelin-web/src/app/services/interpreter.service.ts
similarity index 100%
rename from zeppelin-web-angular/src/app/services/interpreter.service.ts
rename to zeppelin-web/src/app/services/interpreter.service.ts
diff --git a/zeppelin-web-angular/src/app/services/job-manager.service.ts b/zeppelin-web/src/app/services/job-manager.service.ts
similarity index 100%
rename from zeppelin-web-angular/src/app/services/job-manager.service.ts
rename to zeppelin-web/src/app/services/job-manager.service.ts
diff --git a/zeppelin-web-angular/src/app/services/message.service.ts b/zeppelin-web/src/app/services/message.service.ts
similarity index 100%
rename from zeppelin-web-angular/src/app/services/message.service.ts
rename to zeppelin-web/src/app/services/message.service.ts
diff --git a/zeppelin-web-angular/src/app/services/ng-template-adapter.service.ts b/zeppelin-web/src/app/services/ng-template-adapter.service.ts
similarity index 100%
rename from zeppelin-web-angular/src/app/services/ng-template-adapter.service.ts
rename to zeppelin-web/src/app/services/ng-template-adapter.service.ts
diff --git a/zeppelin-web-angular/src/app/services/ng-z.service.ts b/zeppelin-web/src/app/services/ng-z.service.ts
similarity index 100%
rename from zeppelin-web-angular/src/app/services/ng-z.service.ts
rename to zeppelin-web/src/app/services/ng-z.service.ts
diff --git a/zeppelin-web-angular/src/app/services/note-action.service.ts b/zeppelin-web/src/app/services/note-action.service.ts
similarity index 100%
rename from zeppelin-web-angular/src/app/services/note-action.service.ts
rename to zeppelin-web/src/app/services/note-action.service.ts
diff --git a/zeppelin-web-angular/src/app/services/note-list.service.ts b/zeppelin-web/src/app/services/note-list.service.ts
similarity index 100%
rename from zeppelin-web-angular/src/app/services/note-list.service.ts
rename to zeppelin-web/src/app/services/note-list.service.ts
diff --git a/zeppelin-web-angular/src/app/services/note-status.service.ts b/zeppelin-web/src/app/services/note-status.service.ts
similarity index 100%
rename from zeppelin-web-angular/src/app/services/note-status.service.ts
rename to zeppelin-web/src/app/services/note-status.service.ts
diff --git a/zeppelin-web-angular/src/app/services/note-var-share.service.ts b/zeppelin-web/src/app/services/note-var-share.service.ts
similarity index 100%
rename from zeppelin-web-angular/src/app/services/note-var-share.service.ts
rename to zeppelin-web/src/app/services/note-var-share.service.ts
diff --git a/zeppelin-web-angular/src/app/services/notebook-repos.service.ts b/zeppelin-web/src/app/services/notebook-repos.service.ts
similarity index 100%
rename from zeppelin-web-angular/src/app/services/notebook-repos.service.ts
rename to zeppelin-web/src/app/services/notebook-repos.service.ts
diff --git a/zeppelin-web-angular/src/app/services/notebook-search.service.ts b/zeppelin-web/src/app/services/notebook-search.service.ts
similarity index 100%
rename from zeppelin-web-angular/src/app/services/notebook-search.service.ts
rename to zeppelin-web/src/app/services/notebook-search.service.ts
diff --git a/zeppelin-web-angular/src/app/services/public-api.ts b/zeppelin-web/src/app/services/public-api.ts
similarity index 100%
rename from zeppelin-web-angular/src/app/services/public-api.ts
rename to zeppelin-web/src/app/services/public-api.ts
diff --git a/zeppelin-web-angular/src/app/services/runtime-compiler.service.ts b/zeppelin-web/src/app/services/runtime-compiler.service.ts
similarity index 100%
rename from zeppelin-web-angular/src/app/services/runtime-compiler.service.ts
rename to zeppelin-web/src/app/services/runtime-compiler.service.ts
diff --git a/zeppelin-web-angular/src/app/services/save-as.service.ts b/zeppelin-web/src/app/services/save-as.service.ts
similarity index 100%
rename from zeppelin-web-angular/src/app/services/save-as.service.ts
rename to zeppelin-web/src/app/services/save-as.service.ts
diff --git a/zeppelin-web-angular/src/app/services/security.service.ts b/zeppelin-web/src/app/services/security.service.ts
similarity index 100%
rename from zeppelin-web-angular/src/app/services/security.service.ts
rename to zeppelin-web/src/app/services/security.service.ts
diff --git a/zeppelin-web-angular/src/app/services/shortcut.service.ts b/zeppelin-web/src/app/services/shortcut.service.ts
similarity index 100%
rename from zeppelin-web-angular/src/app/services/shortcut.service.ts
rename to zeppelin-web/src/app/services/shortcut.service.ts
diff --git a/zeppelin-web-angular/src/app/services/ticket.service.ts b/zeppelin-web/src/app/services/ticket.service.ts
similarity index 100%
rename from zeppelin-web-angular/src/app/services/ticket.service.ts
rename to zeppelin-web/src/app/services/ticket.service.ts
diff --git a/zeppelin-web-angular/src/app/share/about-zeppelin/about-zeppelin.component.html b/zeppelin-web/src/app/share/about-zeppelin/about-zeppelin.component.html
similarity index 100%
rename from zeppelin-web-angular/src/app/share/about-zeppelin/about-zeppelin.component.html
rename to zeppelin-web/src/app/share/about-zeppelin/about-zeppelin.component.html
diff --git a/zeppelin-web-angular/src/app/share/about-zeppelin/about-zeppelin.component.less b/zeppelin-web/src/app/share/about-zeppelin/about-zeppelin.component.less
similarity index 100%
rename from zeppelin-web-angular/src/app/share/about-zeppelin/about-zeppelin.component.less
rename to zeppelin-web/src/app/share/about-zeppelin/about-zeppelin.component.less
diff --git a/zeppelin-web-angular/src/app/share/about-zeppelin/about-zeppelin.component.ts b/zeppelin-web/src/app/share/about-zeppelin/about-zeppelin.component.ts
similarity index 100%
rename from zeppelin-web-angular/src/app/share/about-zeppelin/about-zeppelin.component.ts
rename to zeppelin-web/src/app/share/about-zeppelin/about-zeppelin.component.ts
diff --git a/zeppelin-web-angular/src/app/share/code-editor/code-editor.component.html b/zeppelin-web/src/app/share/code-editor/code-editor.component.html
similarity index 100%
rename from zeppelin-web-angular/src/app/share/code-editor/code-editor.component.html
rename to zeppelin-web/src/app/share/code-editor/code-editor.component.html
diff --git a/zeppelin-web-angular/src/app/share/code-editor/code-editor.component.ts b/zeppelin-web/src/app/share/code-editor/code-editor.component.ts
similarity index 100%
rename from zeppelin-web-angular/src/app/share/code-editor/code-editor.component.ts
rename to zeppelin-web/src/app/share/code-editor/code-editor.component.ts
diff --git a/zeppelin-web-angular/src/app/share/code-editor/code-editor.module.ts b/zeppelin-web/src/app/share/code-editor/code-editor.module.ts
similarity index 100%
rename from zeppelin-web-angular/src/app/share/code-editor/code-editor.module.ts
rename to zeppelin-web/src/app/share/code-editor/code-editor.module.ts
diff --git a/zeppelin-web-angular/src/app/share/code-editor/code-editor.service.ts b/zeppelin-web/src/app/share/code-editor/code-editor.service.ts
similarity index 100%
rename from zeppelin-web-angular/src/app/share/code-editor/code-editor.service.ts
rename to zeppelin-web/src/app/share/code-editor/code-editor.service.ts
diff --git a/zeppelin-web-angular/src/app/share/code-editor/index.ts b/zeppelin-web/src/app/share/code-editor/index.ts
similarity index 100%
rename from zeppelin-web-angular/src/app/share/code-editor/index.ts
rename to zeppelin-web/src/app/share/code-editor/index.ts
diff --git a/zeppelin-web-angular/src/app/share/code-editor/nz-code-editor.definitions.ts b/zeppelin-web/src/app/share/code-editor/nz-code-editor.definitions.ts
similarity index 100%
rename from zeppelin-web-angular/src/app/share/code-editor/nz-code-editor.definitions.ts
rename to zeppelin-web/src/app/share/code-editor/nz-code-editor.definitions.ts
diff --git a/zeppelin-web-angular/src/app/share/code-editor/public-api.ts b/zeppelin-web/src/app/share/code-editor/public-api.ts
similarity index 100%
rename from zeppelin-web-angular/src/app/share/code-editor/public-api.ts
rename to zeppelin-web/src/app/share/code-editor/public-api.ts
diff --git a/zeppelin-web-angular/src/app/share/external-links/external-link.directive.ts b/zeppelin-web/src/app/share/external-links/external-link.directive.ts
similarity index 100%
rename from zeppelin-web-angular/src/app/share/external-links/external-link.directive.ts
rename to zeppelin-web/src/app/share/external-links/external-link.directive.ts
diff --git a/zeppelin-web-angular/src/app/share/folder-rename/folder-rename.component.html b/zeppelin-web/src/app/share/folder-rename/folder-rename.component.html
similarity index 100%
rename from zeppelin-web-angular/src/app/share/folder-rename/folder-rename.component.html
rename to zeppelin-web/src/app/share/folder-rename/folder-rename.component.html
diff --git a/zeppelin-web-angular/src/app/share/folder-rename/folder-rename.component.less b/zeppelin-web/src/app/share/folder-rename/folder-rename.component.less
similarity index 100%
rename from zeppelin-web-angular/src/app/share/folder-rename/folder-rename.component.less
rename to zeppelin-web/src/app/share/folder-rename/folder-rename.component.less
diff --git a/zeppelin-web-angular/src/app/share/folder-rename/folder-rename.component.ts b/zeppelin-web/src/app/share/folder-rename/folder-rename.component.ts
similarity index 100%
rename from zeppelin-web-angular/src/app/share/folder-rename/folder-rename.component.ts
rename to zeppelin-web/src/app/share/folder-rename/folder-rename.component.ts
diff --git a/zeppelin-web-angular/src/app/share/header/header.component.html b/zeppelin-web/src/app/share/header/header.component.html
similarity index 100%
rename from zeppelin-web-angular/src/app/share/header/header.component.html
rename to zeppelin-web/src/app/share/header/header.component.html
diff --git a/zeppelin-web-angular/src/app/share/header/header.component.less b/zeppelin-web/src/app/share/header/header.component.less
similarity index 100%
rename from zeppelin-web-angular/src/app/share/header/header.component.less
rename to zeppelin-web/src/app/share/header/header.component.less
diff --git a/zeppelin-web-angular/src/app/share/header/header.component.ts b/zeppelin-web/src/app/share/header/header.component.ts
similarity index 100%
rename from zeppelin-web-angular/src/app/share/header/header.component.ts
rename to zeppelin-web/src/app/share/header/header.component.ts
diff --git a/zeppelin-web-angular/src/app/share/index.ts b/zeppelin-web/src/app/share/index.ts
similarity index 100%
rename from zeppelin-web-angular/src/app/share/index.ts
rename to zeppelin-web/src/app/share/index.ts
diff --git a/zeppelin-web-angular/src/app/share/math-jax/math-jax.directive.ts b/zeppelin-web/src/app/share/math-jax/math-jax.directive.ts
similarity index 100%
rename from zeppelin-web-angular/src/app/share/math-jax/math-jax.directive.ts
rename to zeppelin-web/src/app/share/math-jax/math-jax.directive.ts
diff --git a/zeppelin-web-angular/src/app/share/ng1-migration/ng1-migration.component.html b/zeppelin-web/src/app/share/ng1-migration/ng1-migration.component.html
similarity index 100%
rename from zeppelin-web-angular/src/app/share/ng1-migration/ng1-migration.component.html
rename to zeppelin-web/src/app/share/ng1-migration/ng1-migration.component.html
diff --git a/zeppelin-web-angular/src/app/share/ng1-migration/ng1-migration.component.less b/zeppelin-web/src/app/share/ng1-migration/ng1-migration.component.less
similarity index 100%
rename from zeppelin-web-angular/src/app/share/ng1-migration/ng1-migration.component.less
rename to zeppelin-web/src/app/share/ng1-migration/ng1-migration.component.less
diff --git a/zeppelin-web-angular/src/app/share/ng1-migration/ng1-migration.component.ts b/zeppelin-web/src/app/share/ng1-migration/ng1-migration.component.ts
similarity index 100%
rename from zeppelin-web-angular/src/app/share/ng1-migration/ng1-migration.component.ts
rename to zeppelin-web/src/app/share/ng1-migration/ng1-migration.component.ts
diff --git a/zeppelin-web-angular/src/app/share/node-list/node-list.component.html b/zeppelin-web/src/app/share/node-list/node-list.component.html
similarity index 100%
rename from zeppelin-web-angular/src/app/share/node-list/node-list.component.html
rename to zeppelin-web/src/app/share/node-list/node-list.component.html
diff --git a/zeppelin-web-angular/src/app/share/node-list/node-list.component.less b/zeppelin-web/src/app/share/node-list/node-list.component.less
similarity index 100%
rename from zeppelin-web-angular/src/app/share/node-list/node-list.component.less
rename to zeppelin-web/src/app/share/node-list/node-list.component.less
diff --git a/zeppelin-web-angular/src/app/share/node-list/node-list.component.ts b/zeppelin-web/src/app/share/node-list/node-list.component.ts
similarity index 100%
rename from zeppelin-web-angular/src/app/share/node-list/node-list.component.ts
rename to zeppelin-web/src/app/share/node-list/node-list.component.ts
diff --git a/zeppelin-web-angular/src/app/share/note-create/note-create.component.html b/zeppelin-web/src/app/share/note-create/note-create.component.html
similarity index 100%
rename from zeppelin-web-angular/src/app/share/note-create/note-create.component.html
rename to zeppelin-web/src/app/share/note-create/note-create.component.html
diff --git a/zeppelin-web-angular/src/app/share/note-create/note-create.component.less b/zeppelin-web/src/app/share/note-create/note-create.component.less
similarity index 100%
rename from zeppelin-web-angular/src/app/share/note-create/note-create.component.less
rename to zeppelin-web/src/app/share/note-create/note-create.component.less
diff --git a/zeppelin-web-angular/src/app/share/note-create/note-create.component.ts b/zeppelin-web/src/app/share/note-create/note-create.component.ts
similarity index 100%
rename from zeppelin-web-angular/src/app/share/note-create/note-create.component.ts
rename to zeppelin-web/src/app/share/note-create/note-create.component.ts
diff --git a/zeppelin-web-angular/src/app/share/note-import/note-import.component.html b/zeppelin-web/src/app/share/note-import/note-import.component.html
similarity index 100%
rename from zeppelin-web-angular/src/app/share/note-import/note-import.component.html
rename to zeppelin-web/src/app/share/note-import/note-import.component.html
diff --git a/zeppelin-web-angular/src/app/share/note-import/note-import.component.less b/zeppelin-web/src/app/share/note-import/note-import.component.less
similarity index 100%
rename from zeppelin-web-angular/src/app/share/note-import/note-import.component.less
rename to zeppelin-web/src/app/share/note-import/note-import.component.less
diff --git a/zeppelin-web-angular/src/app/share/note-import/note-import.component.ts b/zeppelin-web/src/app/share/note-import/note-import.component.ts
similarity index 100%
rename from zeppelin-web-angular/src/app/share/note-import/note-import.component.ts
rename to zeppelin-web/src/app/share/note-import/note-import.component.ts
diff --git a/zeppelin-web-angular/src/app/share/note-rename/note-rename.component.html b/zeppelin-web/src/app/share/note-rename/note-rename.component.html
similarity index 100%
rename from zeppelin-web-angular/src/app/share/note-rename/note-rename.component.html
rename to zeppelin-web/src/app/share/note-rename/note-rename.component.html
diff --git a/zeppelin-web-angular/src/app/share/note-rename/note-rename.component.less b/zeppelin-web/src/app/share/note-rename/note-rename.component.less
similarity index 100%
rename from zeppelin-web-angular/src/app/share/note-rename/note-rename.component.less
rename to zeppelin-web/src/app/share/note-rename/note-rename.component.less
diff --git a/zeppelin-web-angular/src/app/share/note-rename/note-rename.component.ts b/zeppelin-web/src/app/share/note-rename/note-rename.component.ts
similarity index 100%
rename from zeppelin-web-angular/src/app/share/note-rename/note-rename.component.ts
rename to zeppelin-web/src/app/share/note-rename/note-rename.component.ts
diff --git a/zeppelin-web-angular/src/app/share/note-toc/note-toc.component.html b/zeppelin-web/src/app/share/note-toc/note-toc.component.html
similarity index 100%
rename from zeppelin-web-angular/src/app/share/note-toc/note-toc.component.html
rename to zeppelin-web/src/app/share/note-toc/note-toc.component.html
diff --git a/zeppelin-web-angular/src/app/share/note-toc/note-toc.component.less b/zeppelin-web/src/app/share/note-toc/note-toc.component.less
similarity index 100%
rename from zeppelin-web-angular/src/app/share/note-toc/note-toc.component.less
rename to zeppelin-web/src/app/share/note-toc/note-toc.component.less
diff --git a/zeppelin-web-angular/src/app/share/note-toc/note-toc.component.ts b/zeppelin-web/src/app/share/note-toc/note-toc.component.ts
similarity index 100%
rename from zeppelin-web-angular/src/app/share/note-toc/note-toc.component.ts
rename to zeppelin-web/src/app/share/note-toc/note-toc.component.ts
diff --git a/zeppelin-web-angular/src/app/share/page-header/page-header.component.html b/zeppelin-web/src/app/share/page-header/page-header.component.html
similarity index 100%
rename from zeppelin-web-angular/src/app/share/page-header/page-header.component.html
rename to zeppelin-web/src/app/share/page-header/page-header.component.html
diff --git a/zeppelin-web-angular/src/app/share/page-header/page-header.component.less b/zeppelin-web/src/app/share/page-header/page-header.component.less
similarity index 100%
rename from zeppelin-web-angular/src/app/share/page-header/page-header.component.less
rename to zeppelin-web/src/app/share/page-header/page-header.component.less
diff --git a/zeppelin-web-angular/src/app/share/page-header/page-header.component.ts b/zeppelin-web/src/app/share/page-header/page-header.component.ts
similarity index 100%
rename from zeppelin-web-angular/src/app/share/page-header/page-header.component.ts
rename to zeppelin-web/src/app/share/page-header/page-header.component.ts
diff --git a/zeppelin-web-angular/src/app/share/pipes/humanize-bytes.pipe.ts b/zeppelin-web/src/app/share/pipes/humanize-bytes.pipe.ts
similarity index 100%
rename from zeppelin-web-angular/src/app/share/pipes/humanize-bytes.pipe.ts
rename to zeppelin-web/src/app/share/pipes/humanize-bytes.pipe.ts
diff --git a/zeppelin-web-angular/src/app/share/pipes/index.ts b/zeppelin-web/src/app/share/pipes/index.ts
similarity index 100%
rename from zeppelin-web-angular/src/app/share/pipes/index.ts
rename to zeppelin-web/src/app/share/pipes/index.ts
diff --git a/zeppelin-web-angular/src/app/share/pipes/public-api.ts b/zeppelin-web/src/app/share/pipes/public-api.ts
similarity index 100%
rename from zeppelin-web-angular/src/app/share/pipes/public-api.ts
rename to zeppelin-web/src/app/share/pipes/public-api.ts
diff --git a/zeppelin-web-angular/src/app/share/public-api.ts b/zeppelin-web/src/app/share/public-api.ts
similarity index 100%
rename from zeppelin-web-angular/src/app/share/public-api.ts
rename to zeppelin-web/src/app/share/public-api.ts
diff --git a/zeppelin-web-angular/src/app/share/resize-handle/index.ts b/zeppelin-web/src/app/share/resize-handle/index.ts
similarity index 100%
rename from zeppelin-web-angular/src/app/share/resize-handle/index.ts
rename to zeppelin-web/src/app/share/resize-handle/index.ts
diff --git a/zeppelin-web-angular/src/app/share/resize-handle/public-api.ts b/zeppelin-web/src/app/share/resize-handle/public-api.ts
similarity index 100%
rename from zeppelin-web-angular/src/app/share/resize-handle/public-api.ts
rename to zeppelin-web/src/app/share/resize-handle/public-api.ts
diff --git a/zeppelin-web-angular/src/app/share/resize-handle/resize-handle.component.html b/zeppelin-web/src/app/share/resize-handle/resize-handle.component.html
similarity index 100%
rename from zeppelin-web-angular/src/app/share/resize-handle/resize-handle.component.html
rename to zeppelin-web/src/app/share/resize-handle/resize-handle.component.html
diff --git a/zeppelin-web-angular/src/app/share/resize-handle/resize-handle.component.less b/zeppelin-web/src/app/share/resize-handle/resize-handle.component.less
similarity index 100%
rename from zeppelin-web-angular/src/app/share/resize-handle/resize-handle.component.less
rename to zeppelin-web/src/app/share/resize-handle/resize-handle.component.less
diff --git a/zeppelin-web-angular/src/app/share/resize-handle/resize-handle.component.ts b/zeppelin-web/src/app/share/resize-handle/resize-handle.component.ts
similarity index 100%
rename from zeppelin-web-angular/src/app/share/resize-handle/resize-handle.component.ts
rename to zeppelin-web/src/app/share/resize-handle/resize-handle.component.ts
diff --git a/zeppelin-web-angular/src/app/share/run-scripts/run-scripts.directive.ts b/zeppelin-web/src/app/share/run-scripts/run-scripts.directive.ts
similarity index 100%
rename from zeppelin-web-angular/src/app/share/run-scripts/run-scripts.directive.ts
rename to zeppelin-web/src/app/share/run-scripts/run-scripts.directive.ts
diff --git a/zeppelin-web-angular/src/app/share/share.module.ts b/zeppelin-web/src/app/share/share.module.ts
similarity index 100%
rename from zeppelin-web-angular/src/app/share/share.module.ts
rename to zeppelin-web/src/app/share/share.module.ts
diff --git a/zeppelin-web-angular/src/app/share/spin/spin.component.html b/zeppelin-web/src/app/share/spin/spin.component.html
similarity index 100%
rename from zeppelin-web-angular/src/app/share/spin/spin.component.html
rename to zeppelin-web/src/app/share/spin/spin.component.html
diff --git a/zeppelin-web-angular/src/app/share/spin/spin.component.less b/zeppelin-web/src/app/share/spin/spin.component.less
similarity index 100%
rename from zeppelin-web-angular/src/app/share/spin/spin.component.less
rename to zeppelin-web/src/app/share/spin/spin.component.less
diff --git a/zeppelin-web-angular/src/app/share/spin/spin.component.ts b/zeppelin-web/src/app/share/spin/spin.component.ts
similarity index 100%
rename from zeppelin-web-angular/src/app/share/spin/spin.component.ts
rename to zeppelin-web/src/app/share/spin/spin.component.ts
diff --git a/zeppelin-web-angular/src/app/spell/spell-result.ts b/zeppelin-web/src/app/spell/spell-result.ts
similarity index 100%
rename from zeppelin-web-angular/src/app/spell/spell-result.ts
rename to zeppelin-web/src/app/spell/spell-result.ts
diff --git a/zeppelin-web-angular/src/app/utility/css-unit-conversion.ts b/zeppelin-web/src/app/utility/css-unit-conversion.ts
similarity index 100%
rename from zeppelin-web-angular/src/app/utility/css-unit-conversion.ts
rename to zeppelin-web/src/app/utility/css-unit-conversion.ts
diff --git a/zeppelin-web-angular/src/app/utility/element.ts b/zeppelin-web/src/app/utility/element.ts
similarity index 100%
rename from zeppelin-web-angular/src/app/utility/element.ts
rename to zeppelin-web/src/app/utility/element.ts
diff --git a/zeppelin-web-angular/src/app/utility/get-keyword-positions.ts b/zeppelin-web/src/app/utility/get-keyword-positions.ts
similarity index 100%
rename from zeppelin-web-angular/src/app/utility/get-keyword-positions.ts
rename to zeppelin-web/src/app/utility/get-keyword-positions.ts
diff --git a/zeppelin-web-angular/src/app/utility/line-map.ts b/zeppelin-web/src/app/utility/line-map.ts
similarity index 100%
rename from zeppelin-web-angular/src/app/utility/line-map.ts
rename to zeppelin-web/src/app/utility/line-map.ts
diff --git a/zeppelin-web-angular/src/app/visualizations/area-chart/area-chart-visualization.component.html b/zeppelin-web/src/app/visualizations/area-chart/area-chart-visualization.component.html
similarity index 100%
rename from zeppelin-web-angular/src/app/visualizations/area-chart/area-chart-visualization.component.html
rename to zeppelin-web/src/app/visualizations/area-chart/area-chart-visualization.component.html
diff --git a/zeppelin-web-angular/src/app/visualizations/area-chart/area-chart-visualization.component.less b/zeppelin-web/src/app/visualizations/area-chart/area-chart-visualization.component.less
similarity index 100%
rename from zeppelin-web-angular/src/app/visualizations/area-chart/area-chart-visualization.component.less
rename to zeppelin-web/src/app/visualizations/area-chart/area-chart-visualization.component.less
diff --git a/zeppelin-web-angular/src/app/visualizations/area-chart/area-chart-visualization.component.ts b/zeppelin-web/src/app/visualizations/area-chart/area-chart-visualization.component.ts
similarity index 100%
rename from zeppelin-web-angular/src/app/visualizations/area-chart/area-chart-visualization.component.ts
rename to zeppelin-web/src/app/visualizations/area-chart/area-chart-visualization.component.ts
diff --git a/zeppelin-web-angular/src/app/visualizations/area-chart/area-chart-visualization.ts b/zeppelin-web/src/app/visualizations/area-chart/area-chart-visualization.ts
similarity index 100%
rename from zeppelin-web-angular/src/app/visualizations/area-chart/area-chart-visualization.ts
rename to zeppelin-web/src/app/visualizations/area-chart/area-chart-visualization.ts
diff --git a/zeppelin-web-angular/src/app/visualizations/bar-chart/bar-chart-visualization.component.html b/zeppelin-web/src/app/visualizations/bar-chart/bar-chart-visualization.component.html
similarity index 100%
rename from zeppelin-web-angular/src/app/visualizations/bar-chart/bar-chart-visualization.component.html
rename to zeppelin-web/src/app/visualizations/bar-chart/bar-chart-visualization.component.html
diff --git a/zeppelin-web-angular/src/app/visualizations/bar-chart/bar-chart-visualization.component.less b/zeppelin-web/src/app/visualizations/bar-chart/bar-chart-visualization.component.less
similarity index 100%
rename from zeppelin-web-angular/src/app/visualizations/bar-chart/bar-chart-visualization.component.less
rename to zeppelin-web/src/app/visualizations/bar-chart/bar-chart-visualization.component.less
diff --git a/zeppelin-web-angular/src/app/visualizations/bar-chart/bar-chart-visualization.component.ts b/zeppelin-web/src/app/visualizations/bar-chart/bar-chart-visualization.component.ts
similarity index 100%
rename from zeppelin-web-angular/src/app/visualizations/bar-chart/bar-chart-visualization.component.ts
rename to zeppelin-web/src/app/visualizations/bar-chart/bar-chart-visualization.component.ts
diff --git a/zeppelin-web-angular/src/app/visualizations/bar-chart/bar-chart-visualization.ts b/zeppelin-web/src/app/visualizations/bar-chart/bar-chart-visualization.ts
similarity index 100%
rename from zeppelin-web-angular/src/app/visualizations/bar-chart/bar-chart-visualization.ts
rename to zeppelin-web/src/app/visualizations/bar-chart/bar-chart-visualization.ts
diff --git a/zeppelin-web-angular/src/app/visualizations/common/pivot-setting/pivot-setting.component.html b/zeppelin-web/src/app/visualizations/common/pivot-setting/pivot-setting.component.html
similarity index 100%
rename from zeppelin-web-angular/src/app/visualizations/common/pivot-setting/pivot-setting.component.html
rename to zeppelin-web/src/app/visualizations/common/pivot-setting/pivot-setting.component.html
diff --git a/zeppelin-web-angular/src/app/visualizations/common/pivot-setting/pivot-setting.component.less b/zeppelin-web/src/app/visualizations/common/pivot-setting/pivot-setting.component.less
similarity index 100%
rename from zeppelin-web-angular/src/app/visualizations/common/pivot-setting/pivot-setting.component.less
rename to zeppelin-web/src/app/visualizations/common/pivot-setting/pivot-setting.component.less
diff --git a/zeppelin-web-angular/src/app/visualizations/common/pivot-setting/pivot-setting.component.ts b/zeppelin-web/src/app/visualizations/common/pivot-setting/pivot-setting.component.ts
similarity index 100%
rename from zeppelin-web-angular/src/app/visualizations/common/pivot-setting/pivot-setting.component.ts
rename to zeppelin-web/src/app/visualizations/common/pivot-setting/pivot-setting.component.ts
diff --git a/zeppelin-web-angular/src/app/visualizations/common/scatter-setting/scatter-setting.component.html b/zeppelin-web/src/app/visualizations/common/scatter-setting/scatter-setting.component.html
similarity index 100%
rename from zeppelin-web-angular/src/app/visualizations/common/scatter-setting/scatter-setting.component.html
rename to zeppelin-web/src/app/visualizations/common/scatter-setting/scatter-setting.component.html
diff --git a/zeppelin-web-angular/src/app/visualizations/common/scatter-setting/scatter-setting.component.less b/zeppelin-web/src/app/visualizations/common/scatter-setting/scatter-setting.component.less
similarity index 100%
rename from zeppelin-web-angular/src/app/visualizations/common/scatter-setting/scatter-setting.component.less
rename to zeppelin-web/src/app/visualizations/common/scatter-setting/scatter-setting.component.less
diff --git a/zeppelin-web-angular/src/app/visualizations/common/scatter-setting/scatter-setting.component.ts b/zeppelin-web/src/app/visualizations/common/scatter-setting/scatter-setting.component.ts
similarity index 100%
rename from zeppelin-web-angular/src/app/visualizations/common/scatter-setting/scatter-setting.component.ts
rename to zeppelin-web/src/app/visualizations/common/scatter-setting/scatter-setting.component.ts
diff --git a/zeppelin-web-angular/src/app/visualizations/common/util/calc-tick-count.ts b/zeppelin-web/src/app/visualizations/common/util/calc-tick-count.ts
similarity index 100%
rename from zeppelin-web-angular/src/app/visualizations/common/util/calc-tick-count.ts
rename to zeppelin-web/src/app/visualizations/common/util/calc-tick-count.ts
diff --git a/zeppelin-web-angular/src/app/visualizations/common/util/set-x-axis.ts b/zeppelin-web/src/app/visualizations/common/util/set-x-axis.ts
similarity index 100%
rename from zeppelin-web-angular/src/app/visualizations/common/util/set-x-axis.ts
rename to zeppelin-web/src/app/visualizations/common/util/set-x-axis.ts
diff --git a/zeppelin-web-angular/src/app/visualizations/common/x-axis-setting/x-axis-setting.component.html b/zeppelin-web/src/app/visualizations/common/x-axis-setting/x-axis-setting.component.html
similarity index 100%
rename from zeppelin-web-angular/src/app/visualizations/common/x-axis-setting/x-axis-setting.component.html
rename to zeppelin-web/src/app/visualizations/common/x-axis-setting/x-axis-setting.component.html
diff --git a/zeppelin-web-angular/src/app/visualizations/common/x-axis-setting/x-axis-setting.component.less b/zeppelin-web/src/app/visualizations/common/x-axis-setting/x-axis-setting.component.less
similarity index 100%
rename from zeppelin-web-angular/src/app/visualizations/common/x-axis-setting/x-axis-setting.component.less
rename to zeppelin-web/src/app/visualizations/common/x-axis-setting/x-axis-setting.component.less
diff --git a/zeppelin-web-angular/src/app/visualizations/common/x-axis-setting/x-axis-setting.component.ts b/zeppelin-web/src/app/visualizations/common/x-axis-setting/x-axis-setting.component.ts
similarity index 100%
rename from zeppelin-web-angular/src/app/visualizations/common/x-axis-setting/x-axis-setting.component.ts
rename to zeppelin-web/src/app/visualizations/common/x-axis-setting/x-axis-setting.component.ts
diff --git a/zeppelin-web-angular/src/app/visualizations/g2.config.ts b/zeppelin-web/src/app/visualizations/g2.config.ts
similarity index 100%
rename from zeppelin-web-angular/src/app/visualizations/g2.config.ts
rename to zeppelin-web/src/app/visualizations/g2.config.ts
diff --git a/zeppelin-web-angular/src/app/visualizations/line-chart/line-chart-visualization.component.html b/zeppelin-web/src/app/visualizations/line-chart/line-chart-visualization.component.html
similarity index 100%
rename from zeppelin-web-angular/src/app/visualizations/line-chart/line-chart-visualization.component.html
rename to zeppelin-web/src/app/visualizations/line-chart/line-chart-visualization.component.html
diff --git a/zeppelin-web-angular/src/app/visualizations/line-chart/line-chart-visualization.component.less b/zeppelin-web/src/app/visualizations/line-chart/line-chart-visualization.component.less
similarity index 100%
rename from zeppelin-web-angular/src/app/visualizations/line-chart/line-chart-visualization.component.less
rename to zeppelin-web/src/app/visualizations/line-chart/line-chart-visualization.component.less
diff --git a/zeppelin-web-angular/src/app/visualizations/line-chart/line-chart-visualization.component.ts b/zeppelin-web/src/app/visualizations/line-chart/line-chart-visualization.component.ts
similarity index 100%
rename from zeppelin-web-angular/src/app/visualizations/line-chart/line-chart-visualization.component.ts
rename to zeppelin-web/src/app/visualizations/line-chart/line-chart-visualization.component.ts
diff --git a/zeppelin-web-angular/src/app/visualizations/line-chart/line-chart-visualization.ts b/zeppelin-web/src/app/visualizations/line-chart/line-chart-visualization.ts
similarity index 100%
rename from zeppelin-web-angular/src/app/visualizations/line-chart/line-chart-visualization.ts
rename to zeppelin-web/src/app/visualizations/line-chart/line-chart-visualization.ts
diff --git a/zeppelin-web-angular/src/app/visualizations/pie-chart/pie-chart-visualization.component.html b/zeppelin-web/src/app/visualizations/pie-chart/pie-chart-visualization.component.html
similarity index 100%
rename from zeppelin-web-angular/src/app/visualizations/pie-chart/pie-chart-visualization.component.html
rename to zeppelin-web/src/app/visualizations/pie-chart/pie-chart-visualization.component.html
diff --git a/zeppelin-web-angular/src/app/visualizations/pie-chart/pie-chart-visualization.component.less b/zeppelin-web/src/app/visualizations/pie-chart/pie-chart-visualization.component.less
similarity index 100%
rename from zeppelin-web-angular/src/app/visualizations/pie-chart/pie-chart-visualization.component.less
rename to zeppelin-web/src/app/visualizations/pie-chart/pie-chart-visualization.component.less
diff --git a/zeppelin-web-angular/src/app/visualizations/pie-chart/pie-chart-visualization.component.ts b/zeppelin-web/src/app/visualizations/pie-chart/pie-chart-visualization.component.ts
similarity index 100%
rename from zeppelin-web-angular/src/app/visualizations/pie-chart/pie-chart-visualization.component.ts
rename to zeppelin-web/src/app/visualizations/pie-chart/pie-chart-visualization.component.ts
diff --git a/zeppelin-web-angular/src/app/visualizations/pie-chart/pie-chart-visualization.ts b/zeppelin-web/src/app/visualizations/pie-chart/pie-chart-visualization.ts
similarity index 100%
rename from zeppelin-web-angular/src/app/visualizations/pie-chart/pie-chart-visualization.ts
rename to zeppelin-web/src/app/visualizations/pie-chart/pie-chart-visualization.ts
diff --git a/zeppelin-web-angular/src/app/visualizations/scatter-chart/scatter-chart-visualization.component.html b/zeppelin-web/src/app/visualizations/scatter-chart/scatter-chart-visualization.component.html
similarity index 100%
rename from zeppelin-web-angular/src/app/visualizations/scatter-chart/scatter-chart-visualization.component.html
rename to zeppelin-web/src/app/visualizations/scatter-chart/scatter-chart-visualization.component.html
diff --git a/zeppelin-web-angular/src/app/visualizations/scatter-chart/scatter-chart-visualization.component.less b/zeppelin-web/src/app/visualizations/scatter-chart/scatter-chart-visualization.component.less
similarity index 100%
rename from zeppelin-web-angular/src/app/visualizations/scatter-chart/scatter-chart-visualization.component.less
rename to zeppelin-web/src/app/visualizations/scatter-chart/scatter-chart-visualization.component.less
diff --git a/zeppelin-web-angular/src/app/visualizations/scatter-chart/scatter-chart-visualization.component.ts b/zeppelin-web/src/app/visualizations/scatter-chart/scatter-chart-visualization.component.ts
similarity index 100%
rename from zeppelin-web-angular/src/app/visualizations/scatter-chart/scatter-chart-visualization.component.ts
rename to zeppelin-web/src/app/visualizations/scatter-chart/scatter-chart-visualization.component.ts
diff --git a/zeppelin-web-angular/src/app/visualizations/scatter-chart/scatter-chart-visualization.ts b/zeppelin-web/src/app/visualizations/scatter-chart/scatter-chart-visualization.ts
similarity index 100%
rename from zeppelin-web-angular/src/app/visualizations/scatter-chart/scatter-chart-visualization.ts
rename to zeppelin-web/src/app/visualizations/scatter-chart/scatter-chart-visualization.ts
diff --git a/zeppelin-web-angular/src/app/visualizations/table/table-visualization.component.html b/zeppelin-web/src/app/visualizations/table/table-visualization.component.html
similarity index 100%
rename from zeppelin-web-angular/src/app/visualizations/table/table-visualization.component.html
rename to zeppelin-web/src/app/visualizations/table/table-visualization.component.html
diff --git a/zeppelin-web-angular/src/app/visualizations/table/table-visualization.component.less b/zeppelin-web/src/app/visualizations/table/table-visualization.component.less
similarity index 100%
rename from zeppelin-web-angular/src/app/visualizations/table/table-visualization.component.less
rename to zeppelin-web/src/app/visualizations/table/table-visualization.component.less
diff --git a/zeppelin-web-angular/src/app/visualizations/table/table-visualization.component.ts b/zeppelin-web/src/app/visualizations/table/table-visualization.component.ts
similarity index 100%
rename from zeppelin-web-angular/src/app/visualizations/table/table-visualization.component.ts
rename to zeppelin-web/src/app/visualizations/table/table-visualization.component.ts
diff --git a/zeppelin-web-angular/src/app/visualizations/table/table-visualization.ts b/zeppelin-web/src/app/visualizations/table/table-visualization.ts
similarity index 100%
rename from zeppelin-web-angular/src/app/visualizations/table/table-visualization.ts
rename to zeppelin-web/src/app/visualizations/table/table-visualization.ts
diff --git a/zeppelin-web-angular/src/app/visualizations/visualization.module.ts b/zeppelin-web/src/app/visualizations/visualization.module.ts
similarity index 100%
rename from zeppelin-web-angular/src/app/visualizations/visualization.module.ts
rename to zeppelin-web/src/app/visualizations/visualization.module.ts
diff --git a/zeppelin-web-angular/src/assets/.gitkeep b/zeppelin-web/src/assets/.gitkeep
similarity index 100%
rename from zeppelin-web-angular/src/assets/.gitkeep
rename to zeppelin-web/src/assets/.gitkeep
diff --git a/zeppelin-web-angular/src/assets/fonts/patua-one.woff2 b/zeppelin-web/src/assets/fonts/patua-one.woff2
similarity index 100%
rename from zeppelin-web-angular/src/assets/fonts/patua-one.woff2
rename to zeppelin-web/src/assets/fonts/patua-one.woff2
diff --git a/zeppelin-web-angular/src/assets/helium-packages/helium-vis-example.umd.js b/zeppelin-web/src/assets/helium-packages/helium-vis-example.umd.js
similarity index 100%
rename from zeppelin-web-angular/src/assets/helium-packages/helium-vis-example.umd.js
rename to zeppelin-web/src/assets/helium-packages/helium-vis-example.umd.js
diff --git a/zeppelin-web-angular/src/assets/images/bg.jpg b/zeppelin-web/src/assets/images/bg.jpg
similarity index 100%
rename from zeppelin-web-angular/src/assets/images/bg.jpg
rename to zeppelin-web/src/assets/images/bg.jpg
diff --git a/zeppelin-web-angular/src/assets/images/zeppelin.png b/zeppelin-web/src/assets/images/zeppelin.png
similarity index 100%
rename from zeppelin-web-angular/src/assets/images/zeppelin.png
rename to zeppelin-web/src/assets/images/zeppelin.png
diff --git a/zeppelin-web-angular/src/assets/images/zeppelin_svg_logo.svg b/zeppelin-web/src/assets/images/zeppelin_svg_logo.svg
similarity index 100%
rename from zeppelin-web-angular/src/assets/images/zeppelin_svg_logo.svg
rename to zeppelin-web/src/assets/images/zeppelin_svg_logo.svg
diff --git a/zeppelin-web-angular/src/assets/images/zeppelin_svg_logo_bg.svg b/zeppelin-web/src/assets/images/zeppelin_svg_logo_bg.svg
similarity index 100%
rename from zeppelin-web-angular/src/assets/images/zeppelin_svg_logo_bg.svg
rename to zeppelin-web/src/assets/images/zeppelin_svg_logo_bg.svg
diff --git a/zeppelin-web-angular/src/browserslist b/zeppelin-web/src/browserslist
similarity index 100%
rename from zeppelin-web-angular/src/browserslist
rename to zeppelin-web/src/browserslist
diff --git a/zeppelin-web-angular/src/environments/environment.prod.ts b/zeppelin-web/src/environments/environment.prod.ts
similarity index 100%
rename from zeppelin-web-angular/src/environments/environment.prod.ts
rename to zeppelin-web/src/environments/environment.prod.ts
diff --git a/zeppelin-web-angular/src/environments/environment.ts b/zeppelin-web/src/environments/environment.ts
similarity index 100%
rename from zeppelin-web-angular/src/environments/environment.ts
rename to zeppelin-web/src/environments/environment.ts
diff --git a/zeppelin-web-angular/src/favicon.ico b/zeppelin-web/src/favicon.ico
similarity index 100%
rename from zeppelin-web-angular/src/favicon.ico
rename to zeppelin-web/src/favicon.ico
diff --git a/zeppelin-web-angular/src/index.html b/zeppelin-web/src/index.html
similarity index 100%
rename from zeppelin-web-angular/src/index.html
rename to zeppelin-web/src/index.html
diff --git a/zeppelin-web-angular/src/karma.conf.js b/zeppelin-web/src/karma.conf.js
similarity index 100%
rename from zeppelin-web-angular/src/karma.conf.js
rename to zeppelin-web/src/karma.conf.js
diff --git a/zeppelin-web-angular/src/main.ts b/zeppelin-web/src/main.ts
similarity index 100%
rename from zeppelin-web-angular/src/main.ts
rename to zeppelin-web/src/main.ts
diff --git a/zeppelin-web-angular/src/polyfills.ts b/zeppelin-web/src/polyfills.ts
similarity index 100%
rename from zeppelin-web-angular/src/polyfills.ts
rename to zeppelin-web/src/polyfills.ts
diff --git a/zeppelin-web-angular/src/styles.less b/zeppelin-web/src/styles.less
similarity index 100%
rename from zeppelin-web-angular/src/styles.less
rename to zeppelin-web/src/styles.less
diff --git a/zeppelin-web-angular/src/styles/base.less b/zeppelin-web/src/styles/base.less
similarity index 100%
rename from zeppelin-web-angular/src/styles/base.less
rename to zeppelin-web/src/styles/base.less
diff --git a/zeppelin-web-angular/src/styles/font.less b/zeppelin-web/src/styles/font.less
similarity index 100%
rename from zeppelin-web-angular/src/styles/font.less
rename to zeppelin-web/src/styles/font.less
diff --git a/zeppelin-web-angular/src/styles/global.less b/zeppelin-web/src/styles/global.less
similarity index 100%
rename from zeppelin-web-angular/src/styles/global.less
rename to zeppelin-web/src/styles/global.less
diff --git a/zeppelin-web-angular/src/styles/rewrite.less b/zeppelin-web/src/styles/rewrite.less
similarity index 100%
rename from zeppelin-web-angular/src/styles/rewrite.less
rename to zeppelin-web/src/styles/rewrite.less
diff --git a/zeppelin-web-angular/src/styles/spin.less b/zeppelin-web/src/styles/spin.less
similarity index 100%
rename from zeppelin-web-angular/src/styles/spin.less
rename to zeppelin-web/src/styles/spin.less
diff --git a/zeppelin-web-angular/src/styles/theme/dark/antd-dark.less b/zeppelin-web/src/styles/theme/dark/antd-dark.less
similarity index 100%
rename from zeppelin-web-angular/src/styles/theme/dark/antd-dark.less
rename to zeppelin-web/src/styles/theme/dark/antd-dark.less
diff --git a/zeppelin-web-angular/src/styles/theme/dark/theme-dark.less b/zeppelin-web/src/styles/theme/dark/theme-dark.less
similarity index 100%
rename from zeppelin-web-angular/src/styles/theme/dark/theme-dark.less
rename to zeppelin-web/src/styles/theme/dark/theme-dark.less
diff --git a/zeppelin-web-angular/src/styles/theme/light/antd-light.less b/zeppelin-web/src/styles/theme/light/antd-light.less
similarity index 100%
rename from zeppelin-web-angular/src/styles/theme/light/antd-light.less
rename to zeppelin-web/src/styles/theme/light/antd-light.less
diff --git a/zeppelin-web-angular/src/styles/theme/light/theme-light.less b/zeppelin-web/src/styles/theme/light/theme-light.less
similarity index 100%
rename from zeppelin-web-angular/src/styles/theme/light/theme-light.less
rename to zeppelin-web/src/styles/theme/light/theme-light.less
diff --git a/zeppelin-web-angular/src/styles/theme/markdown.less b/zeppelin-web/src/styles/theme/markdown.less
similarity index 100%
rename from zeppelin-web-angular/src/styles/theme/markdown.less
rename to zeppelin-web/src/styles/theme/markdown.less
diff --git a/zeppelin-web-angular/src/styles/theme/theme-mixin.less b/zeppelin-web/src/styles/theme/theme-mixin.less
similarity index 100%
rename from zeppelin-web-angular/src/styles/theme/theme-mixin.less
rename to zeppelin-web/src/styles/theme/theme-mixin.less
diff --git a/zeppelin-web-angular/src/test.ts b/zeppelin-web/src/test.ts
similarity index 100%
rename from zeppelin-web-angular/src/test.ts
rename to zeppelin-web/src/test.ts
diff --git a/zeppelin-web-angular/src/tsconfig.app.json b/zeppelin-web/src/tsconfig.app.json
similarity index 100%
rename from zeppelin-web-angular/src/tsconfig.app.json
rename to zeppelin-web/src/tsconfig.app.json
diff --git a/zeppelin-web-angular/src/tsconfig.spec.json b/zeppelin-web/src/tsconfig.spec.json
similarity index 100%
rename from zeppelin-web-angular/src/tsconfig.spec.json
rename to zeppelin-web/src/tsconfig.spec.json
diff --git a/zeppelin-web-angular/src/tslint.json b/zeppelin-web/src/tslint.json
similarity index 100%
rename from zeppelin-web-angular/src/tslint.json
rename to zeppelin-web/src/tslint.json
diff --git a/zeppelin-web-angular/tsconfig.app.json b/zeppelin-web/tsconfig.app.json
similarity index 100%
rename from zeppelin-web-angular/tsconfig.app.json
rename to zeppelin-web/tsconfig.app.json
diff --git a/zeppelin-web-angular/tsconfig.json b/zeppelin-web/tsconfig.json
similarity index 100%
rename from zeppelin-web-angular/tsconfig.json
rename to zeppelin-web/tsconfig.json
diff --git a/zeppelin-web-angular/tsconfig.spec.json b/zeppelin-web/tsconfig.spec.json
similarity index 100%
rename from zeppelin-web-angular/tsconfig.spec.json
rename to zeppelin-web/tsconfig.spec.json
diff --git a/zeppelin-web-angular/tslint.json b/zeppelin-web/tslint.json
similarity index 100%
rename from zeppelin-web-angular/tslint.json
rename to zeppelin-web/tslint.json
diff --git a/zeppelin-web-angular/webpack.partial.js b/zeppelin-web/webpack.partial.js
similarity index 100%
rename from zeppelin-web-angular/webpack.partial.js
rename to zeppelin-web/webpack.partial.js