diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/README.md b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/README.md
new file mode 100644
index 0000000..841cba2
--- /dev/null
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/README.md
@@ -0,0 +1,74 @@
+
+
+# YARN-UI
+
+The YARN UI is an ember based web-app that provides visualization of applications running on the Apache Hadoop YARN framework.
+
+## Configurations
+
+### In configs.env
+ This environment configuration file can be found at `./src/main/webapp/config/configs.env`
+
+ * `ENV.hosts.localBaseAddress` : Local URL. This is empty by default. In case when ResourceManager and Timeline Server (ATS) are running on same node, cross domain requests has to be supported. In such cases, proxy URL can be configured here to handle requests (CORS). For eg:"localhost:1337"
+ * `ENV.hosts.timelineWebAddress` : Timeline web interface can be configured below. By default timeline server is set as localhost:8188, uncomment and change the following value for pointing to a different address.
+ * `ENV.hosts.rmWebAddress` : RM web interface can be configured below. By default RM web address is set as localhost:8088, uncomment and change the following value for pointing to a different address.
+ * `ENV.hosts.protocolScheme` : Protocol scheme. It can be "http:" or "https:". By default, http is used.
+
+## Package & deploy
+
+### Get war package
+ * YARN UI is distributed as a war package.
+ * To build & package UI without running test cases, run `mvn clean package -DskipTests -Pyarn-ui` in this directory.
+ * This would give you a war file in `./target`.
+ * UI build is part of hadoop build, refer BUILDING.txt for more info.
+
+### Using UI war
+##### Remotely:
+ Use webfront tomcat manager to upload & deploy your war remotely.
+##### Manually:
+ The war can be added to any tomcat instance.
+ 1. Remove any old deployments in `$TOMCAT_HOME/webapps`
+ 2. Copy the war to `$TOMCAT_HOME/webapps`
+ 3. Restart tomcat and the war will get deployed. The content of the war would be available in
+ `$TOMCAT_HOME/webapps/hadoop-yarn-ui-[version]` directory.
+
+## Development
+
+All the following commands must be run inside `src/main/webapp`.
+
+### Prerequisites
+
+You will need the following things properly installed on your computer.
+
+* Install [Node.js](http://nodejs.org/) (with NPM)
+* Install [Bower](http://bower.io/)
+* Install all dependencies by running `npm install` & `bower install`
+
+### Running UI
+
+* `npm start`
+* Visit your app at [http://localhost:4200](http://localhost:4200).
+
+### Building
+
+* `npm run build` (production)
+* Files would be stored in "dist/"
+
+### Adding new routes (pages), controllers, components etc.
+
+* Use ember-cli blueprint generator - [Ember CLI](http://ember-cli.com/extending/#generators-and-blueprints)
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/pom.xml b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/pom.xml
index 6d46fda..434fff9 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/pom.xml
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/pom.xml
@@ -30,7 +30,7 @@
${packaging.type}
- jar
+ war
src/main/webapp
node
v0.12.2
@@ -52,9 +52,26 @@
src/main/webapp/bower.json
src/main/webapp/package.json
src/main/webapp/testem.json
+
+ src/main/webapp/dist/**/*
+ src/main/webapp/tmp/**/*
src/main/webapp/public/assets/images/**/*
+ src/main/webapp/public/assets/images/*
src/main/webapp/public/robots.txt
+
+ public/assets/images/**/*
public/crossdomain.xml
+
+ src/main/webapp/.tmp/**/*
+ src/main/webapp/.bowerrc
+ src/main/webapp/.editorconfig
+ src/main/webapp/.ember-cli
+ src/main/webapp/.gitignore
+ src/main/webapp/.jshintrc
+ src/main/webapp/.travis.yml
+ src/main/webapp/.watchmanconfig
+ src/main/webapp/tests/.jshintrc
+ src/main/webapp/blueprints/.jshintrc
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/.bowerrc b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/.bowerrc
new file mode 100644
index 0000000..959e169
--- /dev/null
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/.bowerrc
@@ -0,0 +1,4 @@
+{
+ "directory": "bower_components",
+ "analytics": false
+}
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/.editorconfig b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/.editorconfig
new file mode 100644
index 0000000..47c5438
--- /dev/null
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/.editorconfig
@@ -0,0 +1,34 @@
+# EditorConfig helps developers define and maintain consistent
+# coding styles between different editors and IDEs
+# editorconfig.org
+
+root = true
+
+
+[*]
+end_of_line = lf
+charset = utf-8
+trim_trailing_whitespace = true
+insert_final_newline = true
+indent_style = space
+indent_size = 2
+
+[*.js]
+indent_style = space
+indent_size = 2
+
+[*.hbs]
+insert_final_newline = false
+indent_style = space
+indent_size = 2
+
+[*.css]
+indent_style = space
+indent_size = 2
+
+[*.html]
+indent_style = space
+indent_size = 2
+
+[*.{diff,md}]
+trim_trailing_whitespace = false
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/.ember-cli b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/.ember-cli
new file mode 100644
index 0000000..ee64cfe
--- /dev/null
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/.ember-cli
@@ -0,0 +1,9 @@
+{
+ /**
+ Ember CLI sends analytics information by default. The data is completely
+ anonymous, but there are times when you might want to disable this behavior.
+
+ Setting `disableAnalytics` to true will prevent any data from being sent.
+ */
+ "disableAnalytics": false
+}
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/.gitignore b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/.gitignore
new file mode 100644
index 0000000..8470f82
--- /dev/null
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/.gitignore
@@ -0,0 +1,18 @@
+# See http://help.github.com/ignore-files/ for more about ignoring files.
+
+# compiled output
+/dist
+/tmp
+
+# dependencies
+/node
+/node_modules
+/bower_components
+
+# misc
+/.sass-cache
+/connect.lock
+/coverage/*
+/libpeerconnection.log
+npm-debug.log
+testem.log
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/.jshintrc b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/.jshintrc
new file mode 100644
index 0000000..08096ef
--- /dev/null
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/.jshintrc
@@ -0,0 +1,32 @@
+{
+ "predef": [
+ "document",
+ "window",
+ "-Promise"
+ ],
+ "browser": true,
+ "boss": true,
+ "curly": true,
+ "debug": false,
+ "devel": true,
+ "eqeqeq": true,
+ "evil": true,
+ "forin": false,
+ "immed": false,
+ "laxbreak": false,
+ "newcap": true,
+ "noarg": true,
+ "noempty": false,
+ "nonew": false,
+ "nomen": false,
+ "onevar": false,
+ "plusplus": false,
+ "regexp": false,
+ "undef": true,
+ "sub": true,
+ "strict": false,
+ "white": false,
+ "eqnull": true,
+ "esnext": true,
+ "unused": true
+}
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/.travis.yml b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/.travis.yml
new file mode 100644
index 0000000..66dd107
--- /dev/null
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/.travis.yml
@@ -0,0 +1,23 @@
+---
+language: node_js
+node_js:
+ - "0.12"
+
+sudo: false
+
+cache:
+ directories:
+ - node_modules
+
+before_install:
+ - export PATH=/usr/local/phantomjs-2.0.0/bin:$PATH
+ - "npm config set spin false"
+ - "npm install -g npm@^2"
+
+install:
+ - npm install -g bower
+ - npm install
+ - bower install
+
+script:
+ - npm test
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/.watchmanconfig b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/.watchmanconfig
new file mode 100644
index 0000000..e7834e3
--- /dev/null
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/.watchmanconfig
@@ -0,0 +1,3 @@
+{
+ "ignore_dirs": ["tmp", "dist"]
+}