diff --git a/3party-licenses/mock-LICENSE b/3party-licenses/mock-LICENSE
new file mode 100644
index 0000000..c820924
--- /dev/null
+++ b/3party-licenses/mock-LICENSE
@@ -0,0 +1,26 @@
+Copyright (c) 2003-2013, Michael Foord & the mock team
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are
+met:
+
+    * Redistributions of source code must retain the above copyright
+      notice, this list of conditions and the following disclaimer.
+
+    * Redistributions in binary form must reproduce the above
+      copyright notice, this list of conditions and the following
+      disclaimer in the documentation and/or other materials provided
+      with the distribution.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
diff --git a/LICENSE-binary.txt b/3party-licenses/titan-LICENSE
similarity index 67%
rename from LICENSE-binary.txt
rename to 3party-licenses/titan-LICENSE
index 2fc0d77..0b7eb49 100644
--- a/LICENSE-binary.txt
+++ b/3party-licenses/titan-LICENSE
@@ -1,3 +1,4 @@
+
                                  Apache License
                            Version 2.0, January 2004
                         http://www.apache.org/licenses/
@@ -186,7 +187,7 @@
       same "printed page" as the copyright notice for easier
       identification within third-party archives.
 
-   Copyright [yyyy] [name of copyright owner]
+   Copyright 2012-2013 Aurelius LLC
 
    Licensed under the Apache License, Version 2.0 (the "License");
    you may not use this file except in compliance with the License.
@@ -199,188 +200,3 @@
    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.
-
-
-=======================================================================
-Apache Atlas Subcomponents:
-
-The Apache Atlas project contains subcomponents with separate copyright
-notices and license terms. Your use of the source code for the these
-subcomponents is subject to the terms and conditions of the following
-licenses.
-
------------------------------------------------------------------------
- The MIT License
------------------------------------------------------------------------
-
-The Apache Atlas dashboard bundles the following files under the MIT License:
-
- - AngularJS v1.2.28 (http://angularjs.org) - Copyright (c) 2010-2015 Google, Inc.
- - angular-bootstrap v0.12.1 (https://github.com/angular-ui/bootstrap) - Copyright (c) 2012-2015 the AngularUI Team
- - angular-ui-router v0.2.13 (https://github.com/angular-ui/ui-router) - Copyright (c) 2013-2015 The AngularUI Team, Karsten Sperling
- - angular-ui-utils v0.1.1 (https://github.com/angular-ui/ui-utils) - Copyright (c) 2012 the AngularUI Team
- - d3 v3.5.5 (https://github.com/mbostock/d3) - Copyright (c) 2013, Michael Bostock
- - d3.tip v0.6.6 (https://github.com/mbostock/d3) - Copyright (c) 2013 Justin Palmer
- - bootstrap v3.1.1 (http://getbootstrap.com) - Copyright (c) 2011-2014 Twitter, Inc
- - lodash v3.0.0 (https://github.com/lodash/lodash) - Copyright 2012-2015 The Dojo Foundation <http://dojofoundation.org/>
-         Based on Underscore.js, copyright 2009-2015 Jeremy Ashkenas,
-         DocumentCloud and Investigative Reporters & Editors <http://underscorejs.org/>
- - font-awesome css/less files v4.2.0 (http://fontawesome.io/) - Created by Dave Gandy
- - jquery v2.1.4 (http://jquery.org) - Copyright 2005, 2014 jQuery Foundation and other contributors
-
-
-All rights reserved.
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-THE SOFTWARE.
-
------------------------------------------------------------------------
- BSD-style Licenses
------------------------------------------------------------------------
-
-The Apache Atlas dashboard  bundles the following files under BSD licenses:
-
-(3-clause BSD license)
- - mock v1.0.1 (http://www.voidspace.org.uk/python/mock/)
-            Copyright (c) 2003-2010, Michael Foord
-            All rights reserved.
-            E-mail : fuzzyman AT voidspace DOT org DOT uk
- - D3 v3.5.5 (http://d3js.org/) - Copyright (c) 2010-2014, Michael Bostock
-
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without modification,
-are permitted provided that the following conditions are met:
-
-1. Redistributions of source code must retain the above copyright notice, this list
-   of conditions and the following disclaimer.
-
-2. Redistributions in binary form must reproduce the above copyright notice, this
-   list of conditions and the following disclaimer in the documentation and/or
-   other materials provided with the distribution.
-
-3. Neither the name of the copyright holder nor the names of its contributors may
-   be used to endorse or promote products derived from this software without
-   specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
-IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
-INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
-NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
-PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-POSSIBILITY OF SUCH DAMAGE.
-
------------------------------------------------------------------------
- The Open Font License
------------------------------------------------------------------------
-
-The Apache Atlas dashboard  bundles the following fonts under the
-SIL Open Font License v1.1 (OFT) - http://scripts.sil.org/OFL
-
- - font-awesome fonts v4.2.0 (http://fontawesome.io/) - Created by Dave Gandy
-
-SIL OPEN FONT LICENSE
-
-Version 1.1 - 26 February 2007
-
-PREAMBLE
-The goals of the Open Font License (OFL) are to stimulate worldwide
-development of collaborative font projects, to support the font creation
-efforts of academic and linguistic communities, and to provide a free and
-open framework in which fonts may be shared and improved in partnership
-with others.
-
-The OFL allows the licensed fonts to be used, studied, modified and
-redistributed freely as long as they are not sold by themselves. The
-fonts, including any derivative works, can be bundled, embedded,
-redistributed and/or sold with any software provided that any reserved
-names are not used by derivative works. The fonts and derivatives,
-however, cannot be released under any other type of license. The
-requirement for fonts to remain under this license does not apply
-to any document created using the fonts or their derivatives.
-
-DEFINITIONS
-"Font Software" refers to the set of files released by the Copyright
-Holder(s) under this license and clearly marked as such. This may
-include source files, build scripts and documentation.
-
-"Reserved Font Name" refers to any names specified as such after the
-copyright statement(s).
-
-"Original Version" refers to the collection of Font Software components as
-distributed by the Copyright Holder(s).
-
-"Modified Version" refers to any derivative made by adding to, deleting,
-or substituting — in part or in whole — any of the components of the
-Original Version, by changing formats or by porting the Font Software to a
-new environment.
-
-"Author" refers to any designer, engineer, programmer, technical
-writer or other person who contributed to the Font Software.
-
-PERMISSION & CONDITIONS
-Permission is hereby granted, free of charge, to any person obtaining
-a copy of the Font Software, to use, study, copy, merge, embed, modify,
-redistribute, and sell modified and unmodified copies of the Font
-Software, subject to the following conditions:
-
-1) Neither the Font Software nor any of its individual components,
-in Original or Modified Versions, may be sold by itself.
-
-2) Original or Modified Versions of the Font Software may be bundled,
-redistributed and/or sold with any software, provided that each copy
-contains the above copyright notice and this license. These can be
-included either as stand-alone text files, human-readable headers or
-in the appropriate machine-readable metadata fields within text or
-binary files as long as those fields can be easily viewed by the user.
-
-3) No Modified Version of the Font Software may use the Reserved Font
-Name(s) unless explicit written permission is granted by the corresponding
-Copyright Holder. This restriction only applies to the primary font name as
-presented to the users.
-
-4) The name(s) of the Copyright Holder(s) or the Author(s) of the Font
-Software shall not be used to promote, endorse or advertise any
-Modified Version, except to acknowledge the contribution(s) of the
-Copyright Holder(s) and the Author(s) or with their explicit written
-permission.
-
-5) The Font Software, modified or unmodified, in part or in whole,
-must be distributed entirely under this license, and must not be
-distributed under any other license. The requirement for fonts to
-remain under this license does not apply to any document created
-using the Font Software.
-
-TERMINATION
-This license becomes null and void if any of the above conditions are
-not met.
-
-DISCLAIMER
-THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
-OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL THE
-COPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
-INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL
-DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM
-OTHER DEALINGS IN THE FONT SOFTWARE.
diff --git a/LICENSE.txt b/LICENSE
similarity index 72%
rename from LICENSE.txt
rename to LICENSE
index d6d831c..8f075f5 100755
--- a/LICENSE.txt
+++ b/LICENSE
@@ -209,135 +209,8 @@ notices and license terms. Your use of the source code for the these
 subcomponents is subject to the terms and conditions of the following
 licenses.
 
------------------------------------------------------------------------
- BSD-style Licenses
------------------------------------------------------------------------
-
-The Apache Atlas python tests bundles the following files under BSD licenses:
-
-(3-clause BSD license)
- - mock v1.0.1 (http://www.voidspace.org.uk/python/mock/)
-            Copyright (c) 2003-2010, Michael Foord
-            All rights reserved.
-            E-mail : fuzzyman AT voidspace DOT org DOT uk
-
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without modification,
-are permitted provided that the following conditions are met:
-
-1. Redistributions of source code must retain the above copyright notice, this list
-   of conditions and the following disclaimer.
-
-2. Redistributions in binary form must reproduce the above copyright notice, this
-   list of conditions and the following disclaimer in the documentation and/or
-   other materials provided with the distribution.
-
-3. Neither the name of the copyright holder nor the names of its contributors may
-   be used to endorse or promote products derived from this software without
-   specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
-IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
-INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
-NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
-PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-POSSIBILITY OF SUCH DAMAGE.
-
------------------------------------------------------------------------
- Titan Apache 2.0 License
------------------------------------------------------------------------
-
-  Copyright 2012-2013 Aurelius LLC
-  Licensed 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.
-
------------------------------------------------------------------------
-  Open Source License for Oracle Berkeley DB Java Edition
------------------------------------------------------------------------
-
-  The following is the license that applies to this copy of the Berkeley
-  DB Java Edition software.  For a license to use the Berkeley DB Java
-  Edition software under conditions other than those described here, or
-  to purchase support for this software, please contact Oracle at
-  berkeleydb-info_us@oracle.com.
-
-  =-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=
-  /*
-   * Copyright (c) 2002, 2012 Oracle and/or its affiliates.  All rights reserved.
-   *
-   * Redistribution and use in source and binary forms, with or without
-   * modification, are permitted provided that the following conditions
-   * are met:
-   * 1. Redistributions of source code must retain the above copyright
-   *    notice, this list of conditions and the following disclaimer.
-   * 2. Redistributions in binary form must reproduce the above copyright
-   *    notice, this list of conditions and the following disclaimer in the
-   *    documentation and/or other materials provided with the distribution.
-   * 3. Redistributions in any form must be accompanied by information on
-   *    how to obtain complete source code for the DB software and any
-   *    accompanying software that uses the DB software.  The source code
-   *    must either be included in the distribution or be available for no
-   *    more than the cost of distribution plus a nominal fee, and must be
-   *    freely redistributable under reasonable conditions.  For an
-   *    executable file, complete source code means the source code for all
-   *    modules it contains.  It does not include source code for modules or
-   *    files that typically accompany the major components of the operating
-   *    system on which the executable file runs.
-   *
-   * THIS SOFTWARE IS PROVIDED BY ORACLE ``AS IS'' AND ANY EXPRESS OR
-   * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-   * WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, OR
-   * NON-INFRINGEMENT, ARE DISCLAIMED.  IN NO EVENT SHALL ORACLE BE LIABLE
-   * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-   * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-   * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
-   * BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-   * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
-   * OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
-   * IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-   */
-  =-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=
-  /***
-   * ASM: a very small and fast Java bytecode manipulation framework
-   * Copyright (c) 2000-2005 INRIA, France Telecom
-   * All rights reserved.
-   *
-   * Redistribution and use in source and binary forms, with or without
-   * modification, are permitted provided that the following conditions
-   * are met:
-   * 1. Redistributions of source code must retain the above copyright
-   *    notice, this list of conditions and the following disclaimer.
-   * 2. Redistributions in binary form must reproduce the above copyright
-   *    notice, this list of conditions and the following disclaimer in the
-   *    documentation and/or other materials provided with the distribution.
-   * 3. Neither the name of the copyright holders nor the names of its
-   *    contributors may be used to endorse or promote products derived from
-   *    this software without specific prior written permission.
-   *
-   * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-   * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-   * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-   * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
-   * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-   * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-   * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-   * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-   * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-   * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
-   * THE POSSIBILITY OF SUCH DAMAGE.
-   */
+This product bundles titan 0.5.4, which is available under
+"Apache License".  For details, see 3party-licenses/titan-LICENSE
 
+This product bundles mock(for python tests) 1.0.1, which is available under
+"BSD License".  For details, see 3party-licenses/mock-LICENSE
diff --git a/NOTICE b/NOTICE
new file mode 100755
index 0000000..4eedca1
--- /dev/null
+++ b/NOTICE
@@ -0,0 +1,49 @@
+Apache Atlas (incubating)
+
+Copyright [2015-2016] The Apache Software Foundation
+
+This product includes software developed at
+The Apache Software Foundation (http://www.apache.org/).
+
+==============================================================
+
+This product bundles titan 0.5.4(https://github.com/thinkaurelius/titan/blob/titan05):
+
+==============================================================
+ Titan: Distributed Graph Database
+ Copyright 2012 and onwards Aurelius
+==============================================================
+Titan includes software developed by Aurelius (http://thinkaurelius.com/) and the following individuals:
+
+ * Matthias Broecheler
+ * Dan LaRocque
+ * Marko A. Rodriguez
+ * Stephen Mallette
+ * Pavel Yaskevich
+
+Titan also includes software from other open source projects including, but not limited to (check pom.xml for complete listing):
+
+ * TinkerPop Blueprints [http://blueprints.tinkerpop.com]
+ * TinkerPop Gremlin [http://gremlin.tinkerpop.com]
+ * TinkerPop Rexster [http://rexster.tinkerpop.com]
+ * TinkerPop Frames [http://frames.tinkerpop.com]
+ * Apache Commons [http://commons.apache.org/]
+ * Google Guava [http://code.google.com/p/guava-libraries/]
+ * HPPC [http://labs.carrotsearch.com/hppc.html]
+ * Junit Benchmark [http://labs.carrotsearch.com/junit-benchmarks.html]
+ * Kryo [http://code.google.com/p/kryo/]
+ * SLF4J [http://www.slf4j.org/]
+ * Metrics [http://metrics.codahale.com/]
+ * Apache log4j [http://logging.apache.org/log4j/]
+ * Apache HBase [http://hbase.apache.org/]
+ * Apache Hadoop [http://hadoop.apache.org/]
+ * Apache Cassandra [http://cassandra.apache.org/]
+ * Apache Lucene [http://lucene.apache.org/]
+ * Apache MRUnit [http://mrunit.apache.org/]
+ * Codehaus Groovy [http://groovy.codehaus.org/]
+ * OpenRDF [http://www.openrdf.org/]
+ * Elastic Search [http://www.elasticsearch.org/]
+ * Astyanax [https://github.com/Netflix/astyanax]
+ * JUnit [http://www.junit.org/]
+ * Mockito [http://code.google.com/p/mockito/]
+ * Oracle's BerkeleyDB [http://www.oracle.com/technetwork/products/berkeleydb/] (see license below)
diff --git a/NOTICE.txt b/NOTICE.txt
deleted file mode 100755
index af1c50e..0000000
--- a/NOTICE.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-Apache Atlas (incubating)
-
-Copyright 2015 The Apache Software Foundation
-
-This product includes software developed at
-The Apache Software Foundation (http://www.apache.org/).
diff --git a/distro/src/main/assemblies/src-package.xml b/distro/src/main/assemblies/src-package.xml
index ef6b45c..a17b31e 100755
--- a/distro/src/main/assemblies/src-package.xml
+++ b/distro/src/main/assemblies/src-package.xml
@@ -37,11 +37,6 @@
                 <exclude>**/*.log</exclude>
                 <exclude>**/*.pyc</exclude> <!-- python compiled executable -->
                 <exclude>**/test-output/**</exclude>
-                <exclude>dashboard/.bower-*/**</exclude> <!-- temp libs -->
-                <exclude>dashboard/lib/**</exclude>  <!-- temp libs -->
-                <exclude>dashboard/node*/**</exclude>  <!-- temp libs -->
-                <exclude>dashboard/dist/**</exclude>  <!-- package -->
-                <exclude>dashboard/*.min.js*</exclude> <!-- minified JS -->
                 <exclude>distro/hbase/**</exclude>
                 <exclude>distro/solr/**</exclude>
                 <exclude>**/${sys:atlas.data}/**</exclude>
diff --git a/distro/src/main/assemblies/standalone-package.xml b/distro/src/main/assemblies/standalone-package.xml
index 26c24ea..ff7b784 100755
--- a/distro/src/main/assemblies/standalone-package.xml
+++ b/distro/src/main/assemblies/standalone-package.xml
@@ -95,8 +95,8 @@
             <outputDirectory>/</outputDirectory>
             <includes>
                 <include>DISCLAIMER.txt</include>
-                <include>NOTICE.txt</include>
-                <include>LICENSE.txt</include>
+                <include>NOTICE</include>
+                <include>LICENSE</include>
                 <include>CHANGES.txt</include>
                 <include>README</include>
             </includes>
diff --git a/docs/src/site/twiki/InstallationSteps.twiki b/docs/src/site/twiki/InstallationSteps.twiki
index 09f2b1c..4dae7a3 100644
--- a/docs/src/site/twiki/InstallationSteps.twiki
+++ b/docs/src/site/twiki/InstallationSteps.twiki
@@ -97,8 +97,8 @@ Tar is structured as follows
    |- bin
    ...
 |- README
-|- NOTICE.txt
-|- LICENSE.txt
+|- NOTICE
+|- LICENSE
 |- DISCLAIMER.txt
 |- CHANGES.txt
 
diff --git a/docs/src/site/twiki/QuickStart.twiki b/docs/src/site/twiki/QuickStart.twiki
index 9f3eb52..a3c1b1e 100644
--- a/docs/src/site/twiki/QuickStart.twiki
+++ b/docs/src/site/twiki/QuickStart.twiki
@@ -25,4 +25,4 @@ This will add sample types and instances along with traits as shown in the insta
 ---++ Dashboard
 A simple dashboard with search is available.
 
-   * http://localhost:21000/dashboard
+   * http://localhost:21000/
diff --git a/pom.xml b/pom.xml
index d04c92f..4e7d4fd 100755
--- a/pom.xml
+++ b/pom.xml
@@ -1338,8 +1338,8 @@
                 <directory>..</directory>
                 <targetPath>META-INF</targetPath>
                 <includes>
-                    <include>LICENSE.txt</include>
-                    <include>NOTICE.txt</include>
+                    <include>LICENSE</include>
+                    <include>NOTICE</include>
                 </includes>
             </resource>
         </resources>
@@ -1662,6 +1662,7 @@
                     <useEclipseDefaultExcludes>true</useEclipseDefaultExcludes>
                     <excludeSubProjects>true</excludeSubProjects>
                     <excludes>
+                        <exclude>3party-licenses/**</exclude>
                         <exclude>*.txt</exclude>
                         <exclude>**/*.json</exclude>
                         <exclude>.pc/**</exclude>
diff --git a/release-log.txt b/release-log.txt
index e114e31..056cc98 100644
--- a/release-log.txt
+++ b/release-log.txt
@@ -51,6 +51,7 @@ ATLAS-409 Atlas will not import avro tables with schema read from a file (dosset
 ATLAS-379 Create sqoop and falcon metadata addons (venkatnrangan,bvellanki,sowmyaramesh via shwethags)
 
 ALL CHANGES:
+ATLAS-431 Remove un-used licenses (shwethags)
 ATLAS-934 Exclude temp files in source package (shwethags)
 ATLAS-933 Test failure: HiveHookIT.testInsertIntoTable (shwethags)
 ATLAS-856 Lazy-load type cache provider (dkantor via shwethags)