diff --git a/external/storm-ui/README.md b/external/storm-ui/README.md
new file mode 100644
index 00000000000..4f56e67b8d1
--- /dev/null
+++ b/external/storm-ui/README.md
@@ -0,0 +1,99 @@
+##Package
+* package war
+
+```
+mvn clean package -DskipTests=true -Dwar
+cp ./target/storm-ui.war $TOMCAT_HOME/webapps/
+```
+
+* package jar 
+
+```
+mvn clean package -DskipTests=true
+cp ./target/storm-ui-*.jar  $STORM_HOME/external/storm-ui/
+```
+## MUST Config STORM_CONF_DIR
+
+You can specify the storm configuration directory by setting system environment variable. By default,
+you can create a new directory named ".storm" in the user home,and set the storm configuration by storm.yaml
+
+* config by setting system environment variable
+
+```    
+   export STORM_CONF_DIR
+```
+
+* Create a new directory named ".storm" in the user home. Like "~/.storm"
+
+```    
+    cd ~
+    mkdir .storm
+    vim storm.yaml
+```
+
+## How to Deploy to Tomcat
+* Download apache-tomcat
+
+```
+  wget http://apache.fayea.com/apache-mirror/tomcat/tomcat-7/v7.0.56/bin/apache-tomcat-7.0.56.tar.gz
+```
+* Config Env
+
+```
+vi /etc/profile
+JAVA_HOME=~/software/jdk-current
+CLASS_PATH=$JAVA_HOME/lib:JAVA_HOME/jre/lib:JAVA_HOME/lib/tools.jar:$CLASS_PATH
+PATH=$JAVA_HOME/bin:$PATH
+
+TOMCAT_HOME=~/software/apache-tomcat-7.0.56
+CATALINA_HOME=$TOMCAT_HOME
+PATH=$TOMCAT_HOME/bin:$PATH
+
+export PATH USER LOGNAME MAIL HOSTNAME HISTSIZE INPUTRC CLASS_PATH JAVA_HOME TOMCAT_HOME CATALINA_HOME
+```
+*modify $TOMCAT_HOME/conf/server.xml
+
+```
+add "<Context path="" docBase="storm-ui" debug="0"  reloadable="true" crossContext="true"/>" between <host> and </host>. 
+Like:
+    <Host name="localhost"  appBase="webapps"
+            unpackWARs="true" autoDeploy="true">
+          
+        <!-- SingleSignOn valve, share authentication between web applications
+             Documentation at: /docs/config/valve.html -->
+        <!--
+        <Valve className="org.apache.catalina.authenticator.SingleSignOn" />
+        --> 
+
+        <!-- Access log processes all example.
+             Documentation at: /docs/config/valve.html 
+             Note: The pattern used is equivalent to using pattern="common" -->
+        <Valve className="org.apache.catalina.valves.AccessLogValve" directory="logs"
+               prefix="localhost_access_log." suffix=".txt"
+               pattern="%h %l %u %t &quot;%r&quot; %s %b" />
+    
+       <Context path="" docBase="storm-ui" debug="0"  reloadable="true" crossContext="true"/>
+       
+    </Host>
+```
+
+* modify ./startup.sh & shutdown.sh
+
+```
+write  Config Env to ./startup.sh & shutdown.sh
+```
+* Start TomCat Server
+
+```
+# $TOMCAT_HOME/bin/startup.sh
+Using CATALINA_BASE:  ~/software/apache-tomcat-7.0.56
+Using CATALINA_HOME:  ~/software/apache-tomcat-7.0.56
+Using CATALINA_TMPDIR: ~/software/apache-tomcat-7.0.56/temp
+Using JRE_HOME:  ~/software/jdk1.6.0_45
+Using CLASSPATH:   ~/software/apache-tomcat-7.0.56/bin/bootstrap.jar:~/software/apache-tomcat-7.0.56/bin/tomcat-juli.jar
+```
+* Shut Down TomCat Server
+
+```
+# $TOMCAT_HOME/bin/shutdown.sh
+```
diff --git a/external/storm-ui/pom.xml b/external/storm-ui/pom.xml
new file mode 100644
index 00000000000..7611a786f87
--- /dev/null
+++ b/external/storm-ui/pom.xml
@@ -0,0 +1,98 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+      Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements.  See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License.  You may obtain a copy of the License at
+
+     http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+	<modelVersion>4.0.0</modelVersion>
+	<parent>
+		<groupId>org.apache.storm</groupId>
+		<artifactId>storm</artifactId>
+		<version>0.11.0-SNAPSHOT</version>
+		<relativePath>../../pom.xml</relativePath>
+	</parent>
+	<artifactId>storm-ui</artifactId>
+	<name>${project.artifactId}</name>
+	<description>storm ui</description>
+	<properties>
+		<packaging.type>jar</packaging.type>
+		<scope.type>provided</scope.type>
+	</properties>
+	<profiles>
+		<profile>
+			<activation>
+				<property>
+					<name>war</name>
+				</property>
+			</activation>
+			<properties>
+				<packaging.type>war</packaging.type>
+				<scope.type>compile</scope.type>
+			</properties>
+			<build>
+				<finalName>storm-ui</finalName>
+			</build>
+		</profile>
+	</profiles>
+	<packaging>${packaging.type}</packaging>
+	<dependencies>
+		<dependency>
+			<groupId>org.apache.storm</groupId>
+			<artifactId>storm-core</artifactId>
+			<version>${project.version}</version>
+			<scope>${scope.type}</scope>
+		</dependency>
+    <dependency>
+       <groupId>compojure</groupId>
+       <artifactId>compojure</artifactId>
+       <version>${compojure.version}</version>
+    </dependency>
+    <dependency>
+        <groupId>hiccup</groupId>
+        <artifactId>hiccup</artifactId>
+        <version>${hiccup.version}</version>
+    </dependency>
+	</dependencies>
+  <build>      
+       <plugins>
+           <plugin>
+                <groupId>com.theoryinpractise</groupId>
+                <artifactId>clojure-maven-plugin</artifactId>
+                <extensions>true</extensions>
+                <configuration>
+                    <sourceDirectories>
+                        <sourceDirectory>src/main/clj</sourceDirectory>
+                    </sourceDirectories>
+                    <warnOnReflection>false</warnOnReflection>
+                    <copyDeclaredNamespaceOnly>true</copyDeclaredNamespaceOnly>
+                    <copiedNamespaces>
+                        <copiedNamespace>none</copiedNamespace>
+                    </copiedNamespaces>
+                    <runWithTests>false</runWithTests>
+                </configuration>
+                <executions>
+                    <execution>
+                        <id>compile-clojure</id>
+                        <phase>compile</phase>
+                        <goals>
+                            <goal>compile</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
+    </build>
+</project>
diff --git a/storm-core/src/clj/backtype/storm/LocalDRPC.clj b/external/storm-ui/src/main/clj/backtype/storm/LocalDRPC.clj
similarity index 100%
rename from storm-core/src/clj/backtype/storm/LocalDRPC.clj
rename to external/storm-ui/src/main/clj/backtype/storm/LocalDRPC.clj
diff --git a/storm-core/src/clj/backtype/storm/daemon/drpc.clj b/external/storm-ui/src/main/clj/backtype/storm/daemon/drpc.clj
similarity index 100%
rename from storm-core/src/clj/backtype/storm/daemon/drpc.clj
rename to external/storm-ui/src/main/clj/backtype/storm/daemon/drpc.clj
diff --git a/storm-core/src/clj/backtype/storm/daemon/logviewer.clj b/external/storm-ui/src/main/clj/backtype/storm/daemon/logviewer.clj
similarity index 100%
rename from storm-core/src/clj/backtype/storm/daemon/logviewer.clj
rename to external/storm-ui/src/main/clj/backtype/storm/daemon/logviewer.clj
diff --git a/storm-core/src/clj/backtype/storm/ui/core.clj b/external/storm-ui/src/main/clj/backtype/storm/ui/core.clj
similarity index 100%
rename from storm-core/src/clj/backtype/storm/ui/core.clj
rename to external/storm-ui/src/main/clj/backtype/storm/ui/core.clj
diff --git a/storm-core/src/clj/backtype/storm/ui/helpers.clj b/external/storm-ui/src/main/clj/backtype/storm/ui/helpers.clj
similarity index 100%
rename from storm-core/src/clj/backtype/storm/ui/helpers.clj
rename to external/storm-ui/src/main/clj/backtype/storm/ui/helpers.clj
diff --git a/storm-core/src/clj/storm/trident/testing.clj b/external/storm-ui/src/main/clj/storm/trident/testing.clj
similarity index 100%
rename from storm-core/src/clj/storm/trident/testing.clj
rename to external/storm-ui/src/main/clj/storm/trident/testing.clj
diff --git a/external/storm-ui/src/main/webapp/WEB-INF/web.xml b/external/storm-ui/src/main/webapp/WEB-INF/web.xml
new file mode 100644
index 00000000000..1473d3feb6b
--- /dev/null
+++ b/external/storm-ui/src/main/webapp/WEB-INF/web.xml
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+           Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements.  See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License.  You may obtain a copy of the License at
+
+     http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+
+<web-app version="2.5" xmlns="http://java.sun.com/xml/ns/javaee"
+  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd">
+  <display-name>Storm UI</display-name>
+  <context-param>
+    <param-name>debug</param-name>
+    <param-value>false</param-value>
+  </context-param>
+
+  <session-config>
+    <!-- 10 minutes -->
+    <session-timeout>10</session-timeout>
+  </session-config>
+</web-app>
diff --git a/storm-core/src/ui/public/component.html b/external/storm-ui/src/main/webapp/component.html
similarity index 100%
rename from storm-core/src/ui/public/component.html
rename to external/storm-ui/src/main/webapp/component.html
diff --git a/storm-core/src/ui/public/css/bootstrap-3.3.1.min.css b/external/storm-ui/src/main/webapp/css/bootstrap-3.3.1.min.css
similarity index 100%
rename from storm-core/src/ui/public/css/bootstrap-3.3.1.min.css
rename to external/storm-ui/src/main/webapp/css/bootstrap-3.3.1.min.css
diff --git a/storm-core/src/ui/public/css/dataTables.bootstrap.css b/external/storm-ui/src/main/webapp/css/dataTables.bootstrap.css
similarity index 100%
rename from storm-core/src/ui/public/css/dataTables.bootstrap.css
rename to external/storm-ui/src/main/webapp/css/dataTables.bootstrap.css
diff --git a/storm-core/src/ui/public/css/jquery.dataTables.1.10.4.min.css b/external/storm-ui/src/main/webapp/css/jquery.dataTables.1.10.4.min.css
similarity index 100%
rename from storm-core/src/ui/public/css/jquery.dataTables.1.10.4.min.css
rename to external/storm-ui/src/main/webapp/css/jquery.dataTables.1.10.4.min.css
diff --git a/storm-core/src/ui/public/css/jsonFormatter.min.css b/external/storm-ui/src/main/webapp/css/jsonFormatter.min.css
similarity index 100%
rename from storm-core/src/ui/public/css/jsonFormatter.min.css
rename to external/storm-ui/src/main/webapp/css/jsonFormatter.min.css
diff --git a/storm-core/src/ui/public/css/style.css b/external/storm-ui/src/main/webapp/css/style.css
similarity index 100%
rename from storm-core/src/ui/public/css/style.css
rename to external/storm-ui/src/main/webapp/css/style.css
diff --git a/storm-core/src/ui/public/deep_search_result.html b/external/storm-ui/src/main/webapp/deep_search_result.html
similarity index 100%
rename from storm-core/src/ui/public/deep_search_result.html
rename to external/storm-ui/src/main/webapp/deep_search_result.html
diff --git a/storm-core/src/ui/public/favicon.ico b/external/storm-ui/src/main/webapp/favicon.ico
similarity index 100%
rename from storm-core/src/ui/public/favicon.ico
rename to external/storm-ui/src/main/webapp/favicon.ico
diff --git a/storm-core/src/ui/public/images/back_disabled.png b/external/storm-ui/src/main/webapp/images/back_disabled.png
similarity index 100%
rename from storm-core/src/ui/public/images/back_disabled.png
rename to external/storm-ui/src/main/webapp/images/back_disabled.png
diff --git a/storm-core/src/ui/public/images/back_enabled.png b/external/storm-ui/src/main/webapp/images/back_enabled.png
similarity index 100%
rename from storm-core/src/ui/public/images/back_enabled.png
rename to external/storm-ui/src/main/webapp/images/back_enabled.png
diff --git a/storm-core/src/ui/public/images/back_enabled_hover.png b/external/storm-ui/src/main/webapp/images/back_enabled_hover.png
similarity index 100%
rename from storm-core/src/ui/public/images/back_enabled_hover.png
rename to external/storm-ui/src/main/webapp/images/back_enabled_hover.png
diff --git a/storm-core/src/ui/public/images/bug.png b/external/storm-ui/src/main/webapp/images/bug.png
similarity index 100%
rename from storm-core/src/ui/public/images/bug.png
rename to external/storm-ui/src/main/webapp/images/bug.png
diff --git a/storm-core/src/ui/public/images/forward_disabled.png b/external/storm-ui/src/main/webapp/images/forward_disabled.png
similarity index 100%
rename from storm-core/src/ui/public/images/forward_disabled.png
rename to external/storm-ui/src/main/webapp/images/forward_disabled.png
diff --git a/storm-core/src/ui/public/images/forward_enabled.png b/external/storm-ui/src/main/webapp/images/forward_enabled.png
similarity index 100%
rename from storm-core/src/ui/public/images/forward_enabled.png
rename to external/storm-ui/src/main/webapp/images/forward_enabled.png
diff --git a/storm-core/src/ui/public/images/forward_enabled_hover.png b/external/storm-ui/src/main/webapp/images/forward_enabled_hover.png
similarity index 100%
rename from storm-core/src/ui/public/images/forward_enabled_hover.png
rename to external/storm-ui/src/main/webapp/images/forward_enabled_hover.png
diff --git a/storm-core/src/ui/public/images/search.png b/external/storm-ui/src/main/webapp/images/search.png
similarity index 100%
rename from storm-core/src/ui/public/images/search.png
rename to external/storm-ui/src/main/webapp/images/search.png
diff --git a/storm-core/src/ui/public/images/sort_asc.png b/external/storm-ui/src/main/webapp/images/sort_asc.png
similarity index 100%
rename from storm-core/src/ui/public/images/sort_asc.png
rename to external/storm-ui/src/main/webapp/images/sort_asc.png
diff --git a/storm-core/src/ui/public/images/sort_asc_disabled.png b/external/storm-ui/src/main/webapp/images/sort_asc_disabled.png
similarity index 100%
rename from storm-core/src/ui/public/images/sort_asc_disabled.png
rename to external/storm-ui/src/main/webapp/images/sort_asc_disabled.png
diff --git a/storm-core/src/ui/public/images/sort_both.png b/external/storm-ui/src/main/webapp/images/sort_both.png
similarity index 100%
rename from storm-core/src/ui/public/images/sort_both.png
rename to external/storm-ui/src/main/webapp/images/sort_both.png
diff --git a/storm-core/src/ui/public/images/sort_desc.png b/external/storm-ui/src/main/webapp/images/sort_desc.png
similarity index 100%
rename from storm-core/src/ui/public/images/sort_desc.png
rename to external/storm-ui/src/main/webapp/images/sort_desc.png
diff --git a/storm-core/src/ui/public/images/sort_desc_disabled.png b/external/storm-ui/src/main/webapp/images/sort_desc_disabled.png
similarity index 100%
rename from storm-core/src/ui/public/images/sort_desc_disabled.png
rename to external/storm-ui/src/main/webapp/images/sort_desc_disabled.png
diff --git a/storm-core/src/ui/public/images/spinner.gif b/external/storm-ui/src/main/webapp/images/spinner.gif
similarity index 100%
rename from storm-core/src/ui/public/images/spinner.gif
rename to external/storm-ui/src/main/webapp/images/spinner.gif
diff --git a/storm-core/src/ui/public/images/statistic.png b/external/storm-ui/src/main/webapp/images/statistic.png
similarity index 100%
rename from storm-core/src/ui/public/images/statistic.png
rename to external/storm-ui/src/main/webapp/images/statistic.png
diff --git a/storm-core/src/ui/public/index.html b/external/storm-ui/src/main/webapp/index.html
similarity index 100%
rename from storm-core/src/ui/public/index.html
rename to external/storm-ui/src/main/webapp/index.html
diff --git a/storm-core/src/ui/public/js/arbor-graphics.js b/external/storm-ui/src/main/webapp/js/arbor-graphics.js
similarity index 100%
rename from storm-core/src/ui/public/js/arbor-graphics.js
rename to external/storm-ui/src/main/webapp/js/arbor-graphics.js
diff --git a/storm-core/src/ui/public/js/arbor-tween.js b/external/storm-ui/src/main/webapp/js/arbor-tween.js
similarity index 100%
rename from storm-core/src/ui/public/js/arbor-tween.js
rename to external/storm-ui/src/main/webapp/js/arbor-tween.js
diff --git a/storm-core/src/ui/public/js/arbor.js b/external/storm-ui/src/main/webapp/js/arbor.js
similarity index 100%
rename from storm-core/src/ui/public/js/arbor.js
rename to external/storm-ui/src/main/webapp/js/arbor.js
diff --git a/storm-core/src/ui/public/js/bootstrap-3.3.1.min.js b/external/storm-ui/src/main/webapp/js/bootstrap-3.3.1.min.js
similarity index 100%
rename from storm-core/src/ui/public/js/bootstrap-3.3.1.min.js
rename to external/storm-ui/src/main/webapp/js/bootstrap-3.3.1.min.js
diff --git a/storm-core/src/ui/public/js/dataTables.bootstrap.min.js b/external/storm-ui/src/main/webapp/js/dataTables.bootstrap.min.js
similarity index 100%
rename from storm-core/src/ui/public/js/dataTables.bootstrap.min.js
rename to external/storm-ui/src/main/webapp/js/dataTables.bootstrap.min.js
diff --git a/storm-core/src/ui/public/js/jquery-1.11.1.min.js b/external/storm-ui/src/main/webapp/js/jquery-1.11.1.min.js
similarity index 100%
rename from storm-core/src/ui/public/js/jquery-1.11.1.min.js
rename to external/storm-ui/src/main/webapp/js/jquery-1.11.1.min.js
diff --git a/storm-core/src/ui/public/js/jquery.blockUI.min.js b/external/storm-ui/src/main/webapp/js/jquery.blockUI.min.js
similarity index 100%
rename from storm-core/src/ui/public/js/jquery.blockUI.min.js
rename to external/storm-ui/src/main/webapp/js/jquery.blockUI.min.js
diff --git a/storm-core/src/ui/public/js/jquery.cookies.2.2.0.min.js b/external/storm-ui/src/main/webapp/js/jquery.cookies.2.2.0.min.js
similarity index 100%
rename from storm-core/src/ui/public/js/jquery.cookies.2.2.0.min.js
rename to external/storm-ui/src/main/webapp/js/jquery.cookies.2.2.0.min.js
diff --git a/storm-core/src/ui/public/js/jquery.dataTables.1.10.4.min.js b/external/storm-ui/src/main/webapp/js/jquery.dataTables.1.10.4.min.js
similarity index 100%
rename from storm-core/src/ui/public/js/jquery.dataTables.1.10.4.min.js
rename to external/storm-ui/src/main/webapp/js/jquery.dataTables.1.10.4.min.js
diff --git a/storm-core/src/ui/public/js/jquery.mustache.js b/external/storm-ui/src/main/webapp/js/jquery.mustache.js
similarity index 100%
rename from storm-core/src/ui/public/js/jquery.mustache.js
rename to external/storm-ui/src/main/webapp/js/jquery.mustache.js
diff --git a/storm-core/src/ui/public/js/jsonFormatter.min.js b/external/storm-ui/src/main/webapp/js/jsonFormatter.min.js
similarity index 100%
rename from storm-core/src/ui/public/js/jsonFormatter.min.js
rename to external/storm-ui/src/main/webapp/js/jsonFormatter.min.js
diff --git a/storm-core/src/ui/public/js/moment.min.js b/external/storm-ui/src/main/webapp/js/moment.min.js
similarity index 100%
rename from storm-core/src/ui/public/js/moment.min.js
rename to external/storm-ui/src/main/webapp/js/moment.min.js
diff --git a/storm-core/src/ui/public/js/script.js b/external/storm-ui/src/main/webapp/js/script.js
similarity index 100%
rename from storm-core/src/ui/public/js/script.js
rename to external/storm-ui/src/main/webapp/js/script.js
diff --git a/storm-core/src/ui/public/js/typeahead.jquery.min.js b/external/storm-ui/src/main/webapp/js/typeahead.jquery.min.js
similarity index 100%
rename from storm-core/src/ui/public/js/typeahead.jquery.min.js
rename to external/storm-ui/src/main/webapp/js/typeahead.jquery.min.js
diff --git a/storm-core/src/ui/public/js/url.min.js b/external/storm-ui/src/main/webapp/js/url.min.js
similarity index 100%
rename from storm-core/src/ui/public/js/url.min.js
rename to external/storm-ui/src/main/webapp/js/url.min.js
diff --git a/storm-core/src/ui/public/js/visualization.js b/external/storm-ui/src/main/webapp/js/visualization.js
similarity index 100%
rename from storm-core/src/ui/public/js/visualization.js
rename to external/storm-ui/src/main/webapp/js/visualization.js
diff --git a/storm-core/src/ui/public/logviewer_search.html b/external/storm-ui/src/main/webapp/logviewer_search.html
similarity index 100%
rename from storm-core/src/ui/public/logviewer_search.html
rename to external/storm-ui/src/main/webapp/logviewer_search.html
diff --git a/storm-core/src/ui/public/search_result.html b/external/storm-ui/src/main/webapp/search_result.html
similarity index 100%
rename from storm-core/src/ui/public/search_result.html
rename to external/storm-ui/src/main/webapp/search_result.html
diff --git a/storm-core/src/ui/public/templates/component-page-template.html b/external/storm-ui/src/main/webapp/templates/component-page-template.html
similarity index 100%
rename from storm-core/src/ui/public/templates/component-page-template.html
rename to external/storm-ui/src/main/webapp/templates/component-page-template.html
diff --git a/storm-core/src/ui/public/templates/deep-search-result-page-template.html b/external/storm-ui/src/main/webapp/templates/deep-search-result-page-template.html
similarity index 100%
rename from storm-core/src/ui/public/templates/deep-search-result-page-template.html
rename to external/storm-ui/src/main/webapp/templates/deep-search-result-page-template.html
diff --git a/storm-core/src/ui/public/templates/index-page-template.html b/external/storm-ui/src/main/webapp/templates/index-page-template.html
similarity index 100%
rename from storm-core/src/ui/public/templates/index-page-template.html
rename to external/storm-ui/src/main/webapp/templates/index-page-template.html
diff --git a/storm-core/src/ui/public/templates/json-error-template.html b/external/storm-ui/src/main/webapp/templates/json-error-template.html
similarity index 100%
rename from storm-core/src/ui/public/templates/json-error-template.html
rename to external/storm-ui/src/main/webapp/templates/json-error-template.html
diff --git a/storm-core/src/ui/public/templates/logviewer-search-page-template.html b/external/storm-ui/src/main/webapp/templates/logviewer-search-page-template.html
similarity index 100%
rename from storm-core/src/ui/public/templates/logviewer-search-page-template.html
rename to external/storm-ui/src/main/webapp/templates/logviewer-search-page-template.html
diff --git a/storm-core/src/ui/public/templates/search-result-page-template.html b/external/storm-ui/src/main/webapp/templates/search-result-page-template.html
similarity index 100%
rename from storm-core/src/ui/public/templates/search-result-page-template.html
rename to external/storm-ui/src/main/webapp/templates/search-result-page-template.html
diff --git a/storm-core/src/ui/public/templates/topology-page-template.html b/external/storm-ui/src/main/webapp/templates/topology-page-template.html
similarity index 100%
rename from storm-core/src/ui/public/templates/topology-page-template.html
rename to external/storm-ui/src/main/webapp/templates/topology-page-template.html
diff --git a/storm-core/src/ui/public/templates/user-template.html b/external/storm-ui/src/main/webapp/templates/user-template.html
similarity index 100%
rename from storm-core/src/ui/public/templates/user-template.html
rename to external/storm-ui/src/main/webapp/templates/user-template.html
diff --git a/storm-core/src/ui/public/topology.html b/external/storm-ui/src/main/webapp/topology.html
similarity index 100%
rename from storm-core/src/ui/public/topology.html
rename to external/storm-ui/src/main/webapp/topology.html
diff --git a/pom.xml b/pom.xml
index e7abe943a8c..9174e712d26 100644
--- a/pom.xml
+++ b/pom.xml
@@ -254,6 +254,7 @@
         <module>storm-buildtools/maven-shade-clojure-transformer</module>
         <module>storm-buildtools/storm-maven-plugins</module>
         <module>storm-core</module>
+        <module>external/storm-ui</module>
         <module>external/storm-kafka</module>
         <module>external/storm-hdfs</module>
         <module>external/storm-hbase</module>
@@ -569,14 +570,14 @@
                 <version>${ring-json.version}</version>
             </dependency>
             <dependency>
-	      <groupId>org.eclipse.jetty</groupId>
-	      <artifactId>jetty-servlet</artifactId>
-	      <version>${jetty.version}</version>
+	             <groupId>org.eclipse.jetty</groupId>
+	             <artifactId>jetty-servlet</artifactId>
+	             <version>${jetty.version}</version>
             </dependency>
             <dependency>
-	      <groupId>org.eclipse.jetty</groupId>
-	      <artifactId>jetty-servlets</artifactId>
-	      <version>${jetty.version}</version>
+	             <groupId>org.eclipse.jetty</groupId>
+	             <artifactId>jetty-servlets</artifactId>
+	             <version>${jetty.version}</version>
             </dependency>
             <dependency>
                 <groupId>org.eclipse.jetty</groupId>
@@ -936,25 +937,25 @@
                         <exclude>**/src/py/**</exclude>
 
                         <!-- the following are in the LICENSE file -->
-                        <exclude>**/src/ui/public/js/jquery.dataTables.1.10.4.min.js</exclude>
-                        <exclude>**/src/ui/public/css/jquery.dataTables.1.10.4.min.css</exclude>
-                        <exclude>**/src/ui/public/images/*</exclude>
-                        <exclude>**/src/ui/public/js/bootstrap-3.3.1.min.js</exclude>
-                        <exclude>**/src/ui/public/css/bootstrap-3.3.1.min.css</exclude>
-                        <exclude>**/src/ui/public/js/dataTables.bootstrap.min.js</exclude>
-                        <exclude>**/src/ui/public/css/dataTables.bootstrap.css</exclude>
-                        <exclude>**/src/ui/public/js/jsonFormatter.min.js</exclude>
-                        <exclude>**/src/ui/public/css/jsonFormatter.min.css</exclude>
-                        <exclude>**/src/ui/public/js/jquery-1.11.1.min.js</exclude>
-                        <exclude>**/src/ui/public/js/jquery.cookies.2.2.0.min.js</exclude>
-                        <exclude>**/src/ui/public/js/moment.min.js</exclude>
-                        <exclude>**/src/ui/public/js/jquery.blockUI.min.js</exclude>
-                        <exclude>**/src/ui/public/js/url.min.js</exclude>
-                        <exclude>**/src/ui/public/js/arbor.js</exclude>
-                        <exclude>**/src/ui/public/js/arbor-graphics.js</exclude>
-                        <exclude>**/src/ui/public/js/arbor-tween.js</exclude>
-                        <exclude>**/src/ui/public/js/jquery.mustache.js</exclude>
-                        <exclude>**/src/ui/public/js/typeahead.jquery.min.js</exclude>
+                        <exclude>**/src/main/webapp/js/jquery.dataTables.1.10.4.min.js</exclude>
+                        <exclude>**/src/main/webapp/css/jquery.dataTables.1.10.4.min.css</exclude>
+                        <exclude>**/src/main/webapp/images/*</exclude>
+                        <exclude>**/src/main/webapp/js/bootstrap-3.3.1.min.js</exclude>
+                        <exclude>**/src/main/webapp/css/bootstrap-3.3.1.min.css</exclude>
+                        <exclude>**/src/main/webapp/js/dataTables.bootstrap.min.js</exclude>
+                        <exclude>**/src/main/webapp/css/dataTables.bootstrap.css</exclude>
+                        <exclude>**/src/main/webapp/js/jsonFormatter.min.js</exclude>
+                        <exclude>**/src/main/webapp/css/jsonFormatter.min.css</exclude>
+                        <exclude>**/src/main/webapp/js/jquery-1.11.1.min.js</exclude>
+                        <exclude>**/src/main/webapp/js/jquery.cookies.2.2.0.min.js</exclude>
+                        <exclude>**/src/main/webapp/js/moment.min.js</exclude>
+                        <exclude>**/src/main/webapp/js/jquery.blockUI.min.js</exclude>
+                        <exclude>**/src/main/webapp/js/url.min.js</exclude>
+                        <exclude>**/src/main/webapp/js/arbor.js</exclude>
+                        <exclude>**/src/main/webapp/js/arbor-graphics.js</exclude>
+                        <exclude>**/src/main/webapp/js/arbor-tween.js</exclude>
+                        <exclude>**/src/main/webapp/js/jquery.mustache.js</exclude>
+                        <exclude>**/src/main/webapp/js/typeahead.jquery.min.js</exclude>
 
                         <!-- generated by shade plugin -->
                         <exclude>**/dependency-reduced-pom.xml</exclude>
diff --git a/storm-dist/binary/src/main/assembly/binary.xml b/storm-dist/binary/src/main/assembly/binary.xml
index b2a6104a173..9caa479a759 100644
--- a/storm-dist/binary/src/main/assembly/binary.xml
+++ b/storm-dist/binary/src/main/assembly/binary.xml
@@ -45,14 +45,6 @@
             </includes>
             <fileMode>0755</fileMode>
         </fileSet>
-        <fileSet>
-            <directory>${project.basedir}/../../storm-core/src/ui/public</directory>
-            <outputDirectory>public</outputDirectory>
-            <includes>
-                <include>*/**</include>
-            </includes>
-            <excludes/>
-        </fileSet>
         <fileSet>
             <directory>${project.basedir}/../../examples</directory>
             <outputDirectory>examples</outputDirectory>
@@ -68,6 +60,23 @@
           <outputDirectory>bin</outputDirectory>
         </fileSet>
         <!-- EXTERNAL -->
+        <!-- $STORM_HOME/webapps/storm-ui -->
+        <fileSet>
+          <directory>${project.basedir}/../../external/storm-ui/src/main/webapp</directory>
+          <outputDirectory>webapps/storm-ui</outputDirectory>
+          <includes>
+             <include>**/*</include>
+          </includes>
+        </fileSet>
+        <!-- $STORM_HOME/external/storm-ui/ -->
+        <fileSet>
+          <directory>${project.basedir}/../../external/storm-ui/target</directory>
+          <outputDirectory>external/storm-ui/</outputDirectory>
+          <includes>
+            <include>storm-ui-${project.version}.jar</include>
+            <include>storm-ui.war</include>
+          </includes>
+        </fileSet>
         <fileSet>
             <directory>${project.basedir}/../../external/storm-kafka/target</directory>
             <outputDirectory>external/storm-kafka</outputDirectory>