diff --git a/solr/contrib/velocity/src/resources/velocity/head.vm b/solr/contrib/velocity/src/resources/velocity/head.vm
index 38e5f0c..5d9f357 100644
--- a/solr/contrib/velocity/src/resources/velocity/head.vm
+++ b/solr/contrib/velocity/src/resources/velocity/head.vm
@@ -6,10 +6,10 @@
 
   <meta http-equiv="content-type" content="text/html; charset=UTF-8"/>
 
-  <link rel="icon" type="image/x-icon" href="#{url_root}/img/favicon.ico"/>
-  <link rel="shortcut icon" type="image/x-icon" href="#{url_root}/img/favicon.ico"/>
+  <link rel="icon" type="image/x-icon" href="#{url_root}/ui/img/favicon.ico"/>
+  <link rel="shortcut icon" type="image/x-icon" href="#{url_root}/ui/img/favicon.ico"/>
 
-  <script type="text/javascript" src="#{url_root}/js/lib/jquery-1.7.2.min.js"></script>
+  <script type="text/javascript" src="#{url_root}/ui/js/lib/jquery-1.7.2.min.js"></script>
 
   <style>
     #admin{
diff --git a/solr/contrib/velocity/src/resources/velocity/layout.vm b/solr/contrib/velocity/src/resources/velocity/layout.vm
index aa68ffc..23c61a8 100644
--- a/solr/contrib/velocity/src/resources/velocity/layout.vm
+++ b/solr/contrib/velocity/src/resources/velocity/layout.vm
@@ -5,7 +5,7 @@
   <body>
     <div id="admin"><a href="#url_root/#/#core_name">Solr Admin</a></div>
     <div id="head">
-      <a href="#url_for_home#if($debug)?debug=true#end"><img src="#{url_root}/img/solr.svg" id="logo"/></a>
+      <a href="#url_for_home#if($debug)?debug=true#end"><img src="#{url_root}/ui/img/solr.svg" id="logo"/></a>
     </div>
 
     <div id="content">
diff --git a/solr/core/src/java/org/apache/solr/client/solrj/embedded/JettySolrRunner.java b/solr/core/src/java/org/apache/solr/client/solrj/embedded/JettySolrRunner.java
index 155f52e..ac5af3a 100644
--- a/solr/core/src/java/org/apache/solr/client/solrj/embedded/JettySolrRunner.java
+++ b/solr/core/src/java/org/apache/solr/client/solrj/embedded/JettySolrRunner.java
@@ -94,7 +94,7 @@ public class JettySolrRunner {
 
   private LinkedList<FilterHolder> extraFilters;
 
-  private static final String excludePatterns = "/css/.+,/js/.+,/img/.+,/tpl/.+";
+  private static final String excludePatterns = "/ui/.+";
   
   private int proxyPort = -1;
 
diff --git a/solr/core/src/java/org/apache/solr/servlet/HttpSolrCall.java b/solr/core/src/java/org/apache/solr/servlet/HttpSolrCall.java
index 4f6bae0..62f7f2f 100644
--- a/solr/core/src/java/org/apache/solr/servlet/HttpSolrCall.java
+++ b/solr/core/src/java/org/apache/solr/servlet/HttpSolrCall.java
@@ -194,7 +194,7 @@ public class HttpSolrCall {
     req.setAttribute(SolrRequestParsers.REQUEST_TIMER_SERVLET_ATTRIBUTE, new RTimerTree());
     // put the core container in request attribute
     req.setAttribute("org.apache.solr.CoreContainer", cores);
-    path = req.getServletPath();
+    path = mappingSolrPathToRoot(req.getServletPath());
     if (req.getPathInfo() != null) {
       // this lets you handle /update/commit when /update is a servlet
       path += req.getPathInfo();
@@ -401,7 +401,7 @@ public class HttpSolrCall {
         if (path.equals("/schema") || path.startsWith("/schema/")) {
           solrReq = parser.parse(core, path, req);
           SolrRequestInfo.setRequestInfo(new SolrRequestInfo(solrReq, new SolrQueryResponse()));
-          if (path.equals(req.getServletPath())) {
+          if (path.equals(mappingSolrPathToRoot(req.getServletPath()))) {
             // avoid endless loop - pass through to Restlet via webapp
             action = PASSTHROUGH;
             return;
@@ -1128,6 +1128,14 @@ public class HttpSolrCall {
     return Collections.EMPTY_MAP;
   }
 
+  //TODO remove in 8.x
+  public static String mappingSolrPathToRoot(String path) {
+    if (path.startsWith("/solr")) {
+      path = path.replace("/solr","");
+    }
+    return path;
+  }
+
   /**
    * A faster method for randomly picking items when you do not need to
    * consume all items.
diff --git a/solr/core/src/java/org/apache/solr/servlet/LoadAdminUiServlet.java b/solr/core/src/java/org/apache/solr/servlet/LoadAdminUiServlet.java
index c496ce1..35ab893 100644
--- a/solr/core/src/java/org/apache/solr/servlet/LoadAdminUiServlet.java
+++ b/solr/core/src/java/org/apache/solr/servlet/LoadAdminUiServlet.java
@@ -49,10 +49,9 @@ public final class LoadAdminUiServlet extends BaseSolrServlet {
 
     // This attribute is set by the SolrDispatchFilter
     String admin = request.getRequestURI().substring(request.getContextPath().length());
-    CoreContainer cores = (CoreContainer) request.getAttribute("org.apache.solr.CoreContainer");
     InputStream in = getServletContext().getResourceAsStream(admin);
     Writer out = null;
-    if(in != null && cores != null) {
+    if(in != null) {
       try {
         response.setCharacterEncoding("UTF-8");
         response.setContentType("text/html");
diff --git a/solr/core/src/java/org/apache/solr/util/SolrCLI.java b/solr/core/src/java/org/apache/solr/util/SolrCLI.java
index 4f6cf8d..bc90ae7 100644
--- a/solr/core/src/java/org/apache/solr/util/SolrCLI.java
+++ b/solr/core/src/java/org/apache/solr/util/SolrCLI.java
@@ -200,7 +200,7 @@ public class SolrCLI {
   }
   
   private static final Logger log = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
-  public static final String DEFAULT_SOLR_URL = "http://localhost:8983/solr";  
+  public static final String DEFAULT_SOLR_URL = "http://localhost:8983";
   public static final String ZK_HOST = "localhost:9983";
   
   @SuppressWarnings("static-access")
@@ -2906,7 +2906,7 @@ public class SolrCLI {
       echo(startCmd + "\n");
 
       String solrUrl =
-          String.format(Locale.ROOT, "%s://%s:%d/solr", urlScheme, (host != null ? host : "localhost"), port);
+          String.format(Locale.ROOT, "%s://%s:%d", urlScheme, (host != null ? host : "localhost"), port);
 
       Map<String,Object> nodeStatus = checkPortConflict(solrUrl, solrHomeDir, port, cli);
       if (nodeStatus != null)
diff --git a/solr/example/example-DIH/solr/db/conf/admin-extra.html b/solr/example/example-DIH/solr/db/conf/admin-extra.html
index fecab20..7960d6e 100644
--- a/solr/example/example-DIH/solr/db/conf/admin-extra.html
+++ b/solr/example/example-DIH/solr/db/conf/admin-extra.html
@@ -19,6 +19,6 @@
 right box of the cores overview page. Uncomment this as an example to 
 see there the content will show up.
 
-<img src="img/ico/construction.png"> This line will appear at the top-
+<img src="ui/img/ico/construction.png"> This line will appear at the top-
 right box on collection1's Overview
 -->
diff --git a/solr/example/example-DIH/solr/db/conf/admin-extra.menu-bottom.html b/solr/example/example-DIH/solr/db/conf/admin-extra.menu-bottom.html
index 3359a46..fdd73d0 100644
--- a/solr/example/example-DIH/solr/db/conf/admin-extra.menu-bottom.html
+++ b/solr/example/example-DIH/solr/db/conf/admin-extra.menu-bottom.html
@@ -18,7 +18,7 @@
 <!-- admin-extra.menu-bottom.html -->
 <!--
 <li>
-  <a href="#" style="background-image: url(img/ico/construction.png);">
+  <a href="#" style="background-image: url(ui/img/ico/construction.png);">
     LAST ITEM
   </a>
 </li>
diff --git a/solr/example/example-DIH/solr/db/conf/admin-extra.menu-top.html b/solr/example/example-DIH/solr/db/conf/admin-extra.menu-top.html
index 0886cee..a091a25 100644
--- a/solr/example/example-DIH/solr/db/conf/admin-extra.menu-top.html
+++ b/solr/example/example-DIH/solr/db/conf/admin-extra.menu-top.html
@@ -18,7 +18,7 @@
 <!-- admin-extra.menu-top.html -->
 <!--
 <li>
-  <a href="#" style="background-image: url(img/ico/construction.png);">
+  <a href="#" style="background-image: url(ui/img/ico/construction.png);">
     FIRST ITEM
   </a>
 </li>
diff --git a/solr/example/example-DIH/solr/db/conf/xslt/luke.xsl b/solr/example/example-DIH/solr/db/conf/xslt/luke.xsl
index 05fb5bf..1c7668e 100644
--- a/solr/example/example-DIH/solr/db/conf/xslt/luke.xsl
+++ b/solr/example/example-DIH/solr/db/conf/xslt/luke.xsl
@@ -39,8 +39,8 @@
         <html xmlns="http://www.w3.org/1999/xhtml">
             <head>
                 <link rel="stylesheet" type="text/css" href="solr-admin.css"/>
-                <link rel="icon" href="favicon.ico" type="image/x-icon"/>
-                <link rel="shortcut icon" href="favicon.ico" type="image/x-icon"/>
+                <link rel="icon" href="ui/favicon.ico" type="image/x-icon"/>
+                <link rel="shortcut icon" href="ui/favicon.ico" type="image/x-icon"/>
                 <title>
                     <xsl:value-of select="$title"/>
                 </title>
diff --git a/solr/example/example-DIH/solr/mail/conf/admin-extra.html b/solr/example/example-DIH/solr/mail/conf/admin-extra.html
index fecab20..7960d6e 100644
--- a/solr/example/example-DIH/solr/mail/conf/admin-extra.html
+++ b/solr/example/example-DIH/solr/mail/conf/admin-extra.html
@@ -19,6 +19,6 @@
 right box of the cores overview page. Uncomment this as an example to 
 see there the content will show up.
 
-<img src="img/ico/construction.png"> This line will appear at the top-
+<img src="ui/img/ico/construction.png"> This line will appear at the top-
 right box on collection1's Overview
 -->
diff --git a/solr/example/example-DIH/solr/mail/conf/admin-extra.menu-bottom.html b/solr/example/example-DIH/solr/mail/conf/admin-extra.menu-bottom.html
index 3359a46..fdd73d0 100644
--- a/solr/example/example-DIH/solr/mail/conf/admin-extra.menu-bottom.html
+++ b/solr/example/example-DIH/solr/mail/conf/admin-extra.menu-bottom.html
@@ -18,7 +18,7 @@
 <!-- admin-extra.menu-bottom.html -->
 <!--
 <li>
-  <a href="#" style="background-image: url(img/ico/construction.png);">
+  <a href="#" style="background-image: url(ui/img/ico/construction.png);">
     LAST ITEM
   </a>
 </li>
diff --git a/solr/example/example-DIH/solr/mail/conf/admin-extra.menu-top.html b/solr/example/example-DIH/solr/mail/conf/admin-extra.menu-top.html
index 0886cee..a091a25 100644
--- a/solr/example/example-DIH/solr/mail/conf/admin-extra.menu-top.html
+++ b/solr/example/example-DIH/solr/mail/conf/admin-extra.menu-top.html
@@ -18,7 +18,7 @@
 <!-- admin-extra.menu-top.html -->
 <!--
 <li>
-  <a href="#" style="background-image: url(img/ico/construction.png);">
+  <a href="#" style="background-image: url(ui/img/ico/construction.png);">
     FIRST ITEM
   </a>
 </li>
diff --git a/solr/example/example-DIH/solr/mail/conf/xslt/luke.xsl b/solr/example/example-DIH/solr/mail/conf/xslt/luke.xsl
index 05fb5bf..1c7668e 100644
--- a/solr/example/example-DIH/solr/mail/conf/xslt/luke.xsl
+++ b/solr/example/example-DIH/solr/mail/conf/xslt/luke.xsl
@@ -39,8 +39,8 @@
         <html xmlns="http://www.w3.org/1999/xhtml">
             <head>
                 <link rel="stylesheet" type="text/css" href="solr-admin.css"/>
-                <link rel="icon" href="favicon.ico" type="image/x-icon"/>
-                <link rel="shortcut icon" href="favicon.ico" type="image/x-icon"/>
+                <link rel="icon" href="ui/favicon.ico" type="image/x-icon"/>
+                <link rel="shortcut icon" href="ui/favicon.ico" type="image/x-icon"/>
                 <title>
                     <xsl:value-of select="$title"/>
                 </title>
diff --git a/solr/example/example-DIH/solr/rss/conf/admin-extra.html b/solr/example/example-DIH/solr/rss/conf/admin-extra.html
index fecab20..7960d6e 100644
--- a/solr/example/example-DIH/solr/rss/conf/admin-extra.html
+++ b/solr/example/example-DIH/solr/rss/conf/admin-extra.html
@@ -19,6 +19,6 @@
 right box of the cores overview page. Uncomment this as an example to 
 see there the content will show up.
 
-<img src="img/ico/construction.png"> This line will appear at the top-
+<img src="ui/img/ico/construction.png"> This line will appear at the top-
 right box on collection1's Overview
 -->
diff --git a/solr/example/example-DIH/solr/rss/conf/admin-extra.menu-bottom.html b/solr/example/example-DIH/solr/rss/conf/admin-extra.menu-bottom.html
index 3359a46..fdd73d0 100644
--- a/solr/example/example-DIH/solr/rss/conf/admin-extra.menu-bottom.html
+++ b/solr/example/example-DIH/solr/rss/conf/admin-extra.menu-bottom.html
@@ -18,7 +18,7 @@
 <!-- admin-extra.menu-bottom.html -->
 <!--
 <li>
-  <a href="#" style="background-image: url(img/ico/construction.png);">
+  <a href="#" style="background-image: url(ui/img/ico/construction.png);">
     LAST ITEM
   </a>
 </li>
diff --git a/solr/example/example-DIH/solr/rss/conf/admin-extra.menu-top.html b/solr/example/example-DIH/solr/rss/conf/admin-extra.menu-top.html
index 0886cee..a091a25 100644
--- a/solr/example/example-DIH/solr/rss/conf/admin-extra.menu-top.html
+++ b/solr/example/example-DIH/solr/rss/conf/admin-extra.menu-top.html
@@ -18,7 +18,7 @@
 <!-- admin-extra.menu-top.html -->
 <!--
 <li>
-  <a href="#" style="background-image: url(img/ico/construction.png);">
+  <a href="#" style="background-image: url(ui/img/ico/construction.png);">
     FIRST ITEM
   </a>
 </li>
diff --git a/solr/example/example-DIH/solr/rss/conf/xslt/luke.xsl b/solr/example/example-DIH/solr/rss/conf/xslt/luke.xsl
index 05fb5bf..1c7668e 100644
--- a/solr/example/example-DIH/solr/rss/conf/xslt/luke.xsl
+++ b/solr/example/example-DIH/solr/rss/conf/xslt/luke.xsl
@@ -39,8 +39,8 @@
         <html xmlns="http://www.w3.org/1999/xhtml">
             <head>
                 <link rel="stylesheet" type="text/css" href="solr-admin.css"/>
-                <link rel="icon" href="favicon.ico" type="image/x-icon"/>
-                <link rel="shortcut icon" href="favicon.ico" type="image/x-icon"/>
+                <link rel="icon" href="ui/favicon.ico" type="image/x-icon"/>
+                <link rel="shortcut icon" href="ui/favicon.ico" type="image/x-icon"/>
                 <title>
                     <xsl:value-of select="$title"/>
                 </title>
diff --git a/solr/example/example-DIH/solr/solr/conf/admin-extra.html b/solr/example/example-DIH/solr/solr/conf/admin-extra.html
index fecab20..7960d6e 100644
--- a/solr/example/example-DIH/solr/solr/conf/admin-extra.html
+++ b/solr/example/example-DIH/solr/solr/conf/admin-extra.html
@@ -19,6 +19,6 @@
 right box of the cores overview page. Uncomment this as an example to 
 see there the content will show up.
 
-<img src="img/ico/construction.png"> This line will appear at the top-
+<img src="ui/img/ico/construction.png"> This line will appear at the top-
 right box on collection1's Overview
 -->
diff --git a/solr/example/example-DIH/solr/solr/conf/admin-extra.menu-bottom.html b/solr/example/example-DIH/solr/solr/conf/admin-extra.menu-bottom.html
index 3359a46..fdd73d0 100644
--- a/solr/example/example-DIH/solr/solr/conf/admin-extra.menu-bottom.html
+++ b/solr/example/example-DIH/solr/solr/conf/admin-extra.menu-bottom.html
@@ -18,7 +18,7 @@
 <!-- admin-extra.menu-bottom.html -->
 <!--
 <li>
-  <a href="#" style="background-image: url(img/ico/construction.png);">
+  <a href="#" style="background-image: url(ui/img/ico/construction.png);">
     LAST ITEM
   </a>
 </li>
diff --git a/solr/example/example-DIH/solr/solr/conf/admin-extra.menu-top.html b/solr/example/example-DIH/solr/solr/conf/admin-extra.menu-top.html
index 0886cee..a091a25 100644
--- a/solr/example/example-DIH/solr/solr/conf/admin-extra.menu-top.html
+++ b/solr/example/example-DIH/solr/solr/conf/admin-extra.menu-top.html
@@ -18,7 +18,7 @@
 <!-- admin-extra.menu-top.html -->
 <!--
 <li>
-  <a href="#" style="background-image: url(img/ico/construction.png);">
+  <a href="#" style="background-image: url(ui/img/ico/construction.png);">
     FIRST ITEM
   </a>
 </li>
diff --git a/solr/example/example-DIH/solr/solr/conf/xslt/luke.xsl b/solr/example/example-DIH/solr/solr/conf/xslt/luke.xsl
index 05fb5bf..1c7668e 100644
--- a/solr/example/example-DIH/solr/solr/conf/xslt/luke.xsl
+++ b/solr/example/example-DIH/solr/solr/conf/xslt/luke.xsl
@@ -39,8 +39,8 @@
         <html xmlns="http://www.w3.org/1999/xhtml">
             <head>
                 <link rel="stylesheet" type="text/css" href="solr-admin.css"/>
-                <link rel="icon" href="favicon.ico" type="image/x-icon"/>
-                <link rel="shortcut icon" href="favicon.ico" type="image/x-icon"/>
+                <link rel="icon" href="ui/favicon.ico" type="image/x-icon"/>
+                <link rel="shortcut icon" href="ui/favicon.ico" type="image/x-icon"/>
                 <title>
                     <xsl:value-of select="$title"/>
                 </title>
diff --git a/solr/example/example-DIH/solr/tika/conf/admin-extra.html b/solr/example/example-DIH/solr/tika/conf/admin-extra.html
index fecab20..7960d6e 100644
--- a/solr/example/example-DIH/solr/tika/conf/admin-extra.html
+++ b/solr/example/example-DIH/solr/tika/conf/admin-extra.html
@@ -19,6 +19,6 @@
 right box of the cores overview page. Uncomment this as an example to 
 see there the content will show up.
 
-<img src="img/ico/construction.png"> This line will appear at the top-
+<img src="ui/img/ico/construction.png"> This line will appear at the top-
 right box on collection1's Overview
 -->
diff --git a/solr/example/example-DIH/solr/tika/conf/admin-extra.menu-bottom.html b/solr/example/example-DIH/solr/tika/conf/admin-extra.menu-bottom.html
index 3359a46..fdd73d0 100644
--- a/solr/example/example-DIH/solr/tika/conf/admin-extra.menu-bottom.html
+++ b/solr/example/example-DIH/solr/tika/conf/admin-extra.menu-bottom.html
@@ -18,7 +18,7 @@
 <!-- admin-extra.menu-bottom.html -->
 <!--
 <li>
-  <a href="#" style="background-image: url(img/ico/construction.png);">
+  <a href="#" style="background-image: url(ui/img/ico/construction.png);">
     LAST ITEM
   </a>
 </li>
diff --git a/solr/example/example-DIH/solr/tika/conf/admin-extra.menu-top.html b/solr/example/example-DIH/solr/tika/conf/admin-extra.menu-top.html
index 0886cee..a091a25 100644
--- a/solr/example/example-DIH/solr/tika/conf/admin-extra.menu-top.html
+++ b/solr/example/example-DIH/solr/tika/conf/admin-extra.menu-top.html
@@ -18,7 +18,7 @@
 <!-- admin-extra.menu-top.html -->
 <!--
 <li>
-  <a href="#" style="background-image: url(img/ico/construction.png);">
+  <a href="#" style="background-image: url(ui/img/ico/construction.png);">
     FIRST ITEM
   </a>
 </li>
diff --git a/solr/example/files/conf/velocity/head.vm b/solr/example/files/conf/velocity/head.vm
index 1b3aec9..9beba60 100644
--- a/solr/example/files/conf/velocity/head.vm
+++ b/solr/example/files/conf/velocity/head.vm
@@ -2,10 +2,10 @@
 
 <meta http-equiv="content-type" content="text/html; charset=UTF-8"/>
 
-<link rel="icon" type="image/x-icon" href="#{url_root}/img/favicon.ico"/>
-<link rel="shortcut icon" type="image/x-icon" href="#{url_root}/img/favicon.ico"/>
+<link rel="icon" type="image/x-icon" href="#{url_root}/ui/img/favicon.ico"/>
+<link rel="shortcut icon" type="image/x-icon" href="#{url_root}/ui/img/favicon.ico"/>
 
-<script type="text/javascript" src="#{url_root}/js/lib/jquery-1.7.2.min.js"></script>
+<script type="text/javascript" src="#{url_root}/ui/js/lib/jquery-1.7.2.min.js"></script>
 <script type="text/javascript" src="#{url_for_solr}/admin/file?file=/velocity/js/jquery.tx3-tag-cloud.js&contentType=text/javascript"></script>
 <script type="text/javascript" src="#{url_for_solr}/admin/file?file=/velocity/js/dropit.js&contentType=text/javascript"></script>
 <script type="text/javascript" src="#{url_for_solr}/admin/file?file=/velocity/js/jquery.autocomplete.js&contentType=text/javascript"></script>
diff --git a/solr/example/files/conf/velocity/hit.vm b/solr/example/files/conf/velocity/hit.vm
index 359a555..670f7bc 100644
--- a/solr/example/files/conf/velocity/hit.vm
+++ b/solr/example/files/conf/velocity/hit.vm
@@ -46,7 +46,7 @@
 
 <div class="result-document">
   <span class="result-title">
-    <img src="#{url_root}/img/filetypes/${filetype}.png" align="center">
+    <img src="#{url_root}/ui/img/filetypes/${filetype}.png" align="center">
     <b>$title</b>
   </span>
 
diff --git a/solr/example/files/conf/velocity/layout.vm b/solr/example/files/conf/velocity/layout.vm
index ef6caf7..9910f0c 100644
--- a/solr/example/files/conf/velocity/layout.vm
+++ b/solr/example/files/conf/velocity/layout.vm
@@ -4,7 +4,7 @@
 </head>
   <body>
     <div id="header">
-      <a href="#url_for_home"><img src="#{url_root}/img/solr.svg" id="logo" title="Solr"/></a> $resource.powered_file_search
+      <a href="#url_for_home"><img src="#{url_root}/ui/img/solr.svg" id="logo" title="Solr"/></a> $resource.powered_file_search
     </div>
 
     <div id="header2" onclick="javascript:locale_select()">
diff --git a/solr/example/files/conf/velocity/mime_type_lists.vm b/solr/example/files/conf/velocity/mime_type_lists.vm
index 1468bbd..9d98d6e 100644
--- a/solr/example/files/conf/velocity/mime_type_lists.vm
+++ b/solr/example/files/conf/velocity/mime_type_lists.vm
@@ -4,7 +4,7 @@
 
 ## MimeType to extension map for detecting file type
 ## and showing proper icon
-## List of types match the icons in /solr/img/filetypes
+## List of types match the icons in /ui/img/filetypes
 
 ## Short MimeType Names
 ## Was called $supportedtypes
diff --git a/solr/server/contexts/solr-jetty-context.xml b/solr/server/contexts/solr-jetty-context.xml
index 6392cd1..0b3ea8a 100644
--- a/solr/server/contexts/solr-jetty-context.xml
+++ b/solr/server/contexts/solr-jetty-context.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "http://www.eclipse.org/jetty/configure_9_0.dtd">
 <Configure class="org.eclipse.jetty.webapp.WebAppContext">
-  <Set name="contextPath"><Property name="hostContext" default="/solr"/></Set>
+  <Set name="contextPath"><Property name="hostContext" default="/"/></Set>
   <Set name="war"><Property name="jetty.base"/>/solr-webapp/webapp</Set>
   <Set name="defaultsDescriptor"><Property name="jetty.base"/>/etc/webdefault.xml</Set>
   <Set name="extractWAR">false</Set>
diff --git a/solr/server/etc/jetty.xml b/solr/server/etc/jetty.xml
index 8cb8223..b62f006 100644
--- a/solr/server/etc/jetty.xml
+++ b/solr/server/etc/jetty.xml
@@ -93,7 +93,7 @@
         <Arg>
           <New class="org.eclipse.jetty.rewrite.handler.RedirectRegexRule">
             <Set name="regex">^/$</Set>
-            <Set name="replacement">/solr/</Set>
+            <Set name="replacement">/ui/</Set>
           </New>
         </Arg>
       </Call>
diff --git a/solr/server/solr/configsets/sample_techproducts_configs/conf/admin-extra.html b/solr/server/solr/configsets/sample_techproducts_configs/conf/admin-extra.html
index fecab20..7960d6e 100644
--- a/solr/server/solr/configsets/sample_techproducts_configs/conf/admin-extra.html
+++ b/solr/server/solr/configsets/sample_techproducts_configs/conf/admin-extra.html
@@ -19,6 +19,6 @@
 right box of the cores overview page. Uncomment this as an example to 
 see there the content will show up.
 
-<img src="img/ico/construction.png"> This line will appear at the top-
+<img src="ui/img/ico/construction.png"> This line will appear at the top-
 right box on collection1's Overview
 -->
diff --git a/solr/server/solr/configsets/sample_techproducts_configs/conf/admin-extra.menu-bottom.html b/solr/server/solr/configsets/sample_techproducts_configs/conf/admin-extra.menu-bottom.html
index 3359a46..fdd73d0 100644
--- a/solr/server/solr/configsets/sample_techproducts_configs/conf/admin-extra.menu-bottom.html
+++ b/solr/server/solr/configsets/sample_techproducts_configs/conf/admin-extra.menu-bottom.html
@@ -18,7 +18,7 @@
 <!-- admin-extra.menu-bottom.html -->
 <!--
 <li>
-  <a href="#" style="background-image: url(img/ico/construction.png);">
+  <a href="#" style="background-image: url(ui/img/ico/construction.png);">
     LAST ITEM
   </a>
 </li>
diff --git a/solr/server/solr/configsets/sample_techproducts_configs/conf/admin-extra.menu-top.html b/solr/server/solr/configsets/sample_techproducts_configs/conf/admin-extra.menu-top.html
index 0886cee..a091a25 100644
--- a/solr/server/solr/configsets/sample_techproducts_configs/conf/admin-extra.menu-top.html
+++ b/solr/server/solr/configsets/sample_techproducts_configs/conf/admin-extra.menu-top.html
@@ -18,7 +18,7 @@
 <!-- admin-extra.menu-top.html -->
 <!--
 <li>
-  <a href="#" style="background-image: url(img/ico/construction.png);">
+  <a href="#" style="background-image: url(ui/img/ico/construction.png);">
     FIRST ITEM
   </a>
 </li>
diff --git a/solr/server/solr/configsets/sample_techproducts_configs/conf/velocity/VM_global_library.vm b/solr/server/solr/configsets/sample_techproducts_configs/conf/velocity/VM_global_library.vm
index 76516b7..7afe61f 100644
--- a/solr/server/solr/configsets/sample_techproducts_configs/conf/velocity/VM_global_library.vm
+++ b/solr/server/solr/configsets/sample_techproducts_configs/conf/velocity/VM_global_library.vm
@@ -6,7 +6,7 @@
 
 #macro(param $key)$request.params.get($key)#end
 
-#macro(url_root)/solr#end
+#macro(url_root)#end
 
 ## TODO: s/url_for_solr/url_for_core/ and s/url_root/url_for_solr/
 #macro(core_name)$request.core.name#end
diff --git a/solr/server/solr/configsets/sample_techproducts_configs/conf/velocity/head.vm b/solr/server/solr/configsets/sample_techproducts_configs/conf/velocity/head.vm
index f1ff5c3..4983920 100644
--- a/solr/server/solr/configsets/sample_techproducts_configs/conf/velocity/head.vm
+++ b/solr/server/solr/configsets/sample_techproducts_configs/conf/velocity/head.vm
@@ -6,11 +6,11 @@
   <title>#param('title')</title>
   <meta http-equiv="content-type" content="text/html; charset=UTF-8"/>
 
-  <script type="text/javascript" src="#{url_root}/js/lib/jquery-1.7.2.min.js"></script>
+  <script type="text/javascript" src="#{url_root}/ui/js/lib/jquery-1.7.2.min.js"></script>
   <link rel="stylesheet" type="text/css" href="#{url_for_solr}/admin/file?file=/velocity/main.css&contentType=text/css"/>
   <link rel="stylesheet" href="#{url_for_solr}/admin/file?file=/velocity/jquery.autocomplete.css&contentType=text/css" type="text/css" />
-  <link rel="icon" type="image/x-icon" href="#{url_root}/img/favicon.ico"/>
-  <link rel="shortcut icon" type="image/x-icon" href="#{url_root}/img/favicon.ico"/>
+  <link rel="icon" type="image/x-icon" href="#{url_root}/ui/img/favicon.ico"/>
+  <link rel="shortcut icon" type="image/x-icon" href="#{url_root}/ui/img/favicon.ico"/>
   <script type="text/javascript" src="#{url_for_solr}/admin/file?file=/velocity/jquery.autocomplete.js&contentType=text/javascript"></script>
 
 
diff --git a/solr/server/solr/configsets/sample_techproducts_configs/conf/velocity/header.vm b/solr/server/solr/configsets/sample_techproducts_configs/conf/velocity/header.vm
index a408451..5e40799 100644
--- a/solr/server/solr/configsets/sample_techproducts_configs/conf/velocity/header.vm
+++ b/solr/server/solr/configsets/sample_techproducts_configs/conf/velocity/header.vm
@@ -3,5 +3,5 @@
  *#
 
 <div id="head">
-  <span ><a href="#url_for_home#if($request.params.get('debugQuery'))?debugQuery=true#end"><img src="#{url_root}/img/solr.svg" id="logo"/></a></span>
+  <span ><a href="#url_for_home#if($request.params.get('debugQuery'))?debugQuery=true#end"><img src="#{url_root}/ui/img/solr.svg" id="logo"/></a></span>
 </div>
diff --git a/solr/server/solr/configsets/sample_techproducts_configs/conf/velocity/mime_type_lists.vm b/solr/server/solr/configsets/sample_techproducts_configs/conf/velocity/mime_type_lists.vm
index 1468bbd..9d98d6e 100644
--- a/solr/server/solr/configsets/sample_techproducts_configs/conf/velocity/mime_type_lists.vm
+++ b/solr/server/solr/configsets/sample_techproducts_configs/conf/velocity/mime_type_lists.vm
@@ -4,7 +4,7 @@
 
 ## MimeType to extension map for detecting file type
 ## and showing proper icon
-## List of types match the icons in /solr/img/filetypes
+## List of types match the icons in /ui/img/filetypes
 
 ## Short MimeType Names
 ## Was called $supportedtypes
diff --git a/solr/server/solr/configsets/sample_techproducts_configs/conf/velocity/richtext_doc.vm b/solr/server/solr/configsets/sample_techproducts_configs/conf/velocity/richtext_doc.vm
index 9e8d6cb..63a7b33 100644
--- a/solr/server/solr/configsets/sample_techproducts_configs/conf/velocity/richtext_doc.vm
+++ b/solr/server/solr/configsets/sample_techproducts_configs/conf/velocity/richtext_doc.vm
@@ -53,7 +53,7 @@
 <div class="result-title">
   ## Icon
   ## Small file type icons from http://www.splitbrain.org/projects/file_icons (public domain)
-  <img src="#{url_root}/img/filetypes/${filetype}.png" align="center">
+  <img src="#{url_root}/ui/img/filetypes/${filetype}.png" align="center">
 
   ## Title, hyperlinked
   <a href="${url}" target="_blank">
diff --git a/solr/server/solr/configsets/sample_techproducts_configs/conf/xslt/luke.xsl b/solr/server/solr/configsets/sample_techproducts_configs/conf/xslt/luke.xsl
index 05fb5bf..1c7668e 100644
--- a/solr/server/solr/configsets/sample_techproducts_configs/conf/xslt/luke.xsl
+++ b/solr/server/solr/configsets/sample_techproducts_configs/conf/xslt/luke.xsl
@@ -39,8 +39,8 @@
         <html xmlns="http://www.w3.org/1999/xhtml">
             <head>
                 <link rel="stylesheet" type="text/css" href="solr-admin.css"/>
-                <link rel="icon" href="favicon.ico" type="image/x-icon"/>
-                <link rel="shortcut icon" href="favicon.ico" type="image/x-icon"/>
+                <link rel="icon" href="ui/favicon.ico" type="image/x-icon"/>
+                <link rel="shortcut icon" href="ui/favicon.ico" type="image/x-icon"/>
                 <title>
                     <xsl:value-of select="$title"/>
                 </title>
diff --git a/solr/webapp/build.xml b/solr/webapp/build.xml
index 2ebe084..eff1e3a 100644
--- a/solr/webapp/build.xml
+++ b/solr/webapp/build.xml
@@ -19,7 +19,7 @@
   <description>Solr webapp</description>
 
   <property name="rat.additional-includes" value="**"/>
-  <property name="rat.additional-excludes" value="web/img/**"/>
+  <property name="rat.additional-excludes" value="web/ui/img/**"/>
 
   <import file="../common-build.xml"/>
 
diff --git a/solr/webapp/web/WEB-INF/web.xml b/solr/webapp/web/WEB-INF/web.xml
index 5278ae5..9693192 100644
--- a/solr/webapp/web/WEB-INF/web.xml
+++ b/solr/webapp/web/WEB-INF/web.xml
@@ -56,7 +56,7 @@
     -->
     <init-param>
       <param-name>excludePatterns</param-name>
-      <param-value>/css/.+,/js/.+,/img/.+,/tpl/.+</param-value>
+      <param-value>/ui/.+</param-value>
     </init-param>
   </filter>
 
@@ -87,7 +87,7 @@
     <servlet-class>org.apache.solr.servlet.RedirectServlet</servlet-class>
     <init-param>
       <param-name>destination</param-name>
-      <param-value>${context}/#/</param-value>
+      <param-value>${context}/ui</param-value>
     </init-param>
   </servlet>
   
@@ -105,7 +105,7 @@
     <servlet-class>org.apache.solr.servlet.RedirectServlet</servlet-class>
     <init-param>
       <param-name>destination</param-name>
-      <param-value>${context}/#/~logging</param-value>
+      <param-value>${context}/ui/#/~logging</param-value>
     </init-param>
   </servlet>
 
@@ -118,40 +118,49 @@
     </init-param>
   </servlet>
 
+  <!-- TODO Should remove all servlet-mapping with url-pattern with prefix /solr in 8.x -->
   <servlet-mapping>
     <servlet-name>RedirectOldAdminUI</servlet-name>
-    <url-pattern>/admin/</url-pattern>
+    <url-pattern>/solr/</url-pattern>
   </servlet-mapping>
   <servlet-mapping>
     <servlet-name>RedirectOldAdminUI</servlet-name>
-    <url-pattern>/admin</url-pattern>
+    <url-pattern>/solr</url-pattern>
+  </servlet-mapping>
+  <servlet-mapping>
+    <servlet-name>RedirectOldAdminUI</servlet-name>
+    <url-pattern>/solr/admin/</url-pattern>
+  </servlet-mapping>
+  <servlet-mapping>
+    <servlet-name>RedirectOldAdminUI</servlet-name>
+    <url-pattern>/solr/admin</url-pattern>
   </servlet-mapping>
   <servlet-mapping>
     <servlet-name>RedirectOldZookeeper</servlet-name>
-    <url-pattern>/zookeeper.jsp</url-pattern>
+    <url-pattern>/solr/zookeeper.jsp</url-pattern>
   </servlet-mapping>
   <servlet-mapping>
     <servlet-name>RedirectOldZookeeper</servlet-name>
-    <url-pattern>/zookeeper</url-pattern>
+    <url-pattern>/solr/zookeeper</url-pattern>
   </servlet-mapping>
   <servlet-mapping>
     <servlet-name>RedirectLogging</servlet-name>
-    <url-pattern>/logging</url-pattern>
+    <url-pattern>/solr/logging</url-pattern>
   </servlet-mapping>
 
   <servlet-mapping>
     <servlet-name>LoadAdminUI</servlet-name>
-    <url-pattern>/old.html</url-pattern>
+    <url-pattern>/ui/old.html</url-pattern>
   </servlet-mapping>
 
   <servlet-mapping>
-    <servlet-name>LoadAdminUI</servlet-name>
-    <url-pattern>/index.html</url-pattern>
+    <servlet-name>SolrRestApi</servlet-name>
+    <url-pattern>/schema/*</url-pattern>
   </servlet-mapping>
 
   <servlet-mapping>
     <servlet-name>SolrRestApi</servlet-name>
-    <url-pattern>/schema/*</url-pattern>
+    <url-pattern>/solr/schema/*</url-pattern>
   </servlet-mapping>
   
   <mime-mapping>
diff --git a/solr/webapp/web/css/angular/analysis.css b/solr/webapp/web/ui/css/angular/analysis.css
similarity index 100%
rename from solr/webapp/web/css/angular/analysis.css
rename to solr/webapp/web/ui/css/angular/analysis.css
diff --git a/solr/webapp/web/css/angular/chosen.css b/solr/webapp/web/ui/css/angular/chosen.css
similarity index 100%
rename from solr/webapp/web/css/angular/chosen.css
rename to solr/webapp/web/ui/css/angular/chosen.css
diff --git a/solr/webapp/web/css/angular/cloud.css b/solr/webapp/web/ui/css/angular/cloud.css
similarity index 100%
rename from solr/webapp/web/css/angular/cloud.css
rename to solr/webapp/web/ui/css/angular/cloud.css
diff --git a/solr/webapp/web/css/angular/collections.css b/solr/webapp/web/ui/css/angular/collections.css
similarity index 100%
rename from solr/webapp/web/css/angular/collections.css
rename to solr/webapp/web/ui/css/angular/collections.css
diff --git a/solr/webapp/web/css/angular/common.css b/solr/webapp/web/ui/css/angular/common.css
similarity index 100%
rename from solr/webapp/web/css/angular/common.css
rename to solr/webapp/web/ui/css/angular/common.css
diff --git a/solr/webapp/web/css/angular/cores.css b/solr/webapp/web/ui/css/angular/cores.css
similarity index 100%
rename from solr/webapp/web/css/angular/cores.css
rename to solr/webapp/web/ui/css/angular/cores.css
diff --git a/solr/webapp/web/css/angular/dashboard.css b/solr/webapp/web/ui/css/angular/dashboard.css
similarity index 100%
rename from solr/webapp/web/css/angular/dashboard.css
rename to solr/webapp/web/ui/css/angular/dashboard.css
diff --git a/solr/webapp/web/css/angular/dataimport.css b/solr/webapp/web/ui/css/angular/dataimport.css
similarity index 100%
rename from solr/webapp/web/css/angular/dataimport.css
rename to solr/webapp/web/ui/css/angular/dataimport.css
diff --git a/solr/webapp/web/css/angular/documents.css b/solr/webapp/web/ui/css/angular/documents.css
similarity index 100%
rename from solr/webapp/web/css/angular/documents.css
rename to solr/webapp/web/ui/css/angular/documents.css
diff --git a/solr/webapp/web/css/angular/files.css b/solr/webapp/web/ui/css/angular/files.css
similarity index 100%
rename from solr/webapp/web/css/angular/files.css
rename to solr/webapp/web/ui/css/angular/files.css
diff --git a/solr/webapp/web/css/angular/index.css b/solr/webapp/web/ui/css/angular/index.css
similarity index 100%
rename from solr/webapp/web/css/angular/index.css
rename to solr/webapp/web/ui/css/angular/index.css
diff --git a/solr/webapp/web/css/angular/logging.css b/solr/webapp/web/ui/css/angular/logging.css
similarity index 100%
rename from solr/webapp/web/css/angular/logging.css
rename to solr/webapp/web/ui/css/angular/logging.css
diff --git a/solr/webapp/web/css/angular/menu.css b/solr/webapp/web/ui/css/angular/menu.css
similarity index 100%
rename from solr/webapp/web/css/angular/menu.css
rename to solr/webapp/web/ui/css/angular/menu.css
diff --git a/solr/webapp/web/css/angular/plugins.css b/solr/webapp/web/ui/css/angular/plugins.css
similarity index 100%
rename from solr/webapp/web/css/angular/plugins.css
rename to solr/webapp/web/ui/css/angular/plugins.css
diff --git a/solr/webapp/web/css/angular/query.css b/solr/webapp/web/ui/css/angular/query.css
similarity index 100%
rename from solr/webapp/web/css/angular/query.css
rename to solr/webapp/web/ui/css/angular/query.css
diff --git a/solr/webapp/web/css/angular/replication.css b/solr/webapp/web/ui/css/angular/replication.css
similarity index 100%
rename from solr/webapp/web/css/angular/replication.css
rename to solr/webapp/web/ui/css/angular/replication.css
diff --git a/solr/webapp/web/css/angular/schema.css b/solr/webapp/web/ui/css/angular/schema.css
similarity index 100%
rename from solr/webapp/web/css/angular/schema.css
rename to solr/webapp/web/ui/css/angular/schema.css
diff --git a/solr/webapp/web/css/angular/segments.css b/solr/webapp/web/ui/css/angular/segments.css
similarity index 100%
rename from solr/webapp/web/css/angular/segments.css
rename to solr/webapp/web/ui/css/angular/segments.css
diff --git a/solr/webapp/web/css/angular/stream.css b/solr/webapp/web/ui/css/angular/stream.css
similarity index 100%
rename from solr/webapp/web/css/angular/stream.css
rename to solr/webapp/web/ui/css/angular/stream.css
diff --git a/solr/webapp/web/css/angular/threads.css b/solr/webapp/web/ui/css/angular/threads.css
similarity index 100%
rename from solr/webapp/web/css/angular/threads.css
rename to solr/webapp/web/ui/css/angular/threads.css
diff --git a/solr/webapp/web/css/chosen.css b/solr/webapp/web/ui/css/chosen.css
similarity index 100%
rename from solr/webapp/web/css/chosen.css
rename to solr/webapp/web/ui/css/chosen.css
diff --git a/solr/webapp/web/css/styles/analysis.css b/solr/webapp/web/ui/css/styles/analysis.css
similarity index 100%
rename from solr/webapp/web/css/styles/analysis.css
rename to solr/webapp/web/ui/css/styles/analysis.css
diff --git a/solr/webapp/web/css/styles/cloud.css b/solr/webapp/web/ui/css/styles/cloud.css
similarity index 100%
rename from solr/webapp/web/css/styles/cloud.css
rename to solr/webapp/web/ui/css/styles/cloud.css
diff --git a/solr/webapp/web/css/styles/common.css b/solr/webapp/web/ui/css/styles/common.css
similarity index 100%
rename from solr/webapp/web/css/styles/common.css
rename to solr/webapp/web/ui/css/styles/common.css
diff --git a/solr/webapp/web/css/styles/cores.css b/solr/webapp/web/ui/css/styles/cores.css
similarity index 100%
rename from solr/webapp/web/css/styles/cores.css
rename to solr/webapp/web/ui/css/styles/cores.css
diff --git a/solr/webapp/web/css/styles/dashboard.css b/solr/webapp/web/ui/css/styles/dashboard.css
similarity index 100%
rename from solr/webapp/web/css/styles/dashboard.css
rename to solr/webapp/web/ui/css/styles/dashboard.css
diff --git a/solr/webapp/web/css/styles/dataimport.css b/solr/webapp/web/ui/css/styles/dataimport.css
similarity index 100%
rename from solr/webapp/web/css/styles/dataimport.css
rename to solr/webapp/web/ui/css/styles/dataimport.css
diff --git a/solr/webapp/web/css/styles/documents.css b/solr/webapp/web/ui/css/styles/documents.css
similarity index 100%
rename from solr/webapp/web/css/styles/documents.css
rename to solr/webapp/web/ui/css/styles/documents.css
diff --git a/solr/webapp/web/css/styles/files.css b/solr/webapp/web/ui/css/styles/files.css
similarity index 100%
rename from solr/webapp/web/css/styles/files.css
rename to solr/webapp/web/ui/css/styles/files.css
diff --git a/solr/webapp/web/css/styles/index.css b/solr/webapp/web/ui/css/styles/index.css
similarity index 100%
rename from solr/webapp/web/css/styles/index.css
rename to solr/webapp/web/ui/css/styles/index.css
diff --git a/solr/webapp/web/css/styles/java-properties.css b/solr/webapp/web/ui/css/styles/java-properties.css
similarity index 100%
rename from solr/webapp/web/css/styles/java-properties.css
rename to solr/webapp/web/ui/css/styles/java-properties.css
diff --git a/solr/webapp/web/css/styles/logging.css b/solr/webapp/web/ui/css/styles/logging.css
similarity index 100%
rename from solr/webapp/web/css/styles/logging.css
rename to solr/webapp/web/ui/css/styles/logging.css
diff --git a/solr/webapp/web/css/styles/menu.css b/solr/webapp/web/ui/css/styles/menu.css
similarity index 100%
rename from solr/webapp/web/css/styles/menu.css
rename to solr/webapp/web/ui/css/styles/menu.css
diff --git a/solr/webapp/web/css/styles/plugins.css b/solr/webapp/web/ui/css/styles/plugins.css
similarity index 100%
rename from solr/webapp/web/css/styles/plugins.css
rename to solr/webapp/web/ui/css/styles/plugins.css
diff --git a/solr/webapp/web/css/styles/query.css b/solr/webapp/web/ui/css/styles/query.css
similarity index 100%
rename from solr/webapp/web/css/styles/query.css
rename to solr/webapp/web/ui/css/styles/query.css
diff --git a/solr/webapp/web/css/styles/replication.css b/solr/webapp/web/ui/css/styles/replication.css
similarity index 100%
rename from solr/webapp/web/css/styles/replication.css
rename to solr/webapp/web/ui/css/styles/replication.css
diff --git a/solr/webapp/web/css/styles/schema-browser.css b/solr/webapp/web/ui/css/styles/schema-browser.css
similarity index 100%
rename from solr/webapp/web/css/styles/schema-browser.css
rename to solr/webapp/web/ui/css/styles/schema-browser.css
diff --git a/solr/webapp/web/css/styles/segments.css b/solr/webapp/web/ui/css/styles/segments.css
similarity index 100%
rename from solr/webapp/web/css/styles/segments.css
rename to solr/webapp/web/ui/css/styles/segments.css
diff --git a/solr/webapp/web/css/styles/threads.css b/solr/webapp/web/ui/css/styles/threads.css
similarity index 100%
rename from solr/webapp/web/css/styles/threads.css
rename to solr/webapp/web/ui/css/styles/threads.css
diff --git a/solr/webapp/web/img/favicon.ico b/solr/webapp/web/ui/favicon.ico
similarity index 100%
rename from solr/webapp/web/img/favicon.ico
rename to solr/webapp/web/ui/favicon.ico
diff --git a/solr/webapp/web/img/ZeroClipboard.swf b/solr/webapp/web/ui/img/ZeroClipboard.swf
similarity index 100%
rename from solr/webapp/web/img/ZeroClipboard.swf
rename to solr/webapp/web/ui/img/ZeroClipboard.swf
diff --git a/solr/webapp/web/img/chosen-sprite-2x.png b/solr/webapp/web/ui/img/chosen-sprite-2x.png
similarity index 100%
rename from solr/webapp/web/img/chosen-sprite-2x.png
rename to solr/webapp/web/ui/img/chosen-sprite-2x.png
diff --git a/solr/webapp/web/img/chosen-sprite.png b/solr/webapp/web/ui/img/chosen-sprite.png
similarity index 100%
rename from solr/webapp/web/img/chosen-sprite.png
rename to solr/webapp/web/ui/img/chosen-sprite.png
diff --git a/solr/webapp/web/img/div.gif b/solr/webapp/web/ui/img/div.gif
similarity index 100%
rename from solr/webapp/web/img/div.gif
rename to solr/webapp/web/ui/img/div.gif
diff --git a/solr/webapp/web/favicon.ico b/solr/webapp/web/ui/img/favicon.ico
similarity index 100%
rename from solr/webapp/web/favicon.ico
rename to solr/webapp/web/ui/img/favicon.ico
diff --git a/solr/webapp/web/img/filetypes/7z.png b/solr/webapp/web/ui/img/filetypes/7z.png
similarity index 100%
rename from solr/webapp/web/img/filetypes/7z.png
rename to solr/webapp/web/ui/img/filetypes/7z.png
diff --git a/solr/webapp/web/img/filetypes/README b/solr/webapp/web/ui/img/filetypes/README
similarity index 100%
rename from solr/webapp/web/img/filetypes/README
rename to solr/webapp/web/ui/img/filetypes/README
diff --git a/solr/webapp/web/img/filetypes/ai.png b/solr/webapp/web/ui/img/filetypes/ai.png
similarity index 100%
rename from solr/webapp/web/img/filetypes/ai.png
rename to solr/webapp/web/ui/img/filetypes/ai.png
diff --git a/solr/webapp/web/img/filetypes/aiff.png b/solr/webapp/web/ui/img/filetypes/aiff.png
similarity index 100%
rename from solr/webapp/web/img/filetypes/aiff.png
rename to solr/webapp/web/ui/img/filetypes/aiff.png
diff --git a/solr/webapp/web/img/filetypes/asc.png b/solr/webapp/web/ui/img/filetypes/asc.png
similarity index 100%
rename from solr/webapp/web/img/filetypes/asc.png
rename to solr/webapp/web/ui/img/filetypes/asc.png
diff --git a/solr/webapp/web/img/filetypes/audio.png b/solr/webapp/web/ui/img/filetypes/audio.png
similarity index 100%
rename from solr/webapp/web/img/filetypes/audio.png
rename to solr/webapp/web/ui/img/filetypes/audio.png
diff --git a/solr/webapp/web/img/filetypes/bin.png b/solr/webapp/web/ui/img/filetypes/bin.png
similarity index 100%
rename from solr/webapp/web/img/filetypes/bin.png
rename to solr/webapp/web/ui/img/filetypes/bin.png
diff --git a/solr/webapp/web/img/filetypes/bz2.png b/solr/webapp/web/ui/img/filetypes/bz2.png
similarity index 100%
rename from solr/webapp/web/img/filetypes/bz2.png
rename to solr/webapp/web/ui/img/filetypes/bz2.png
diff --git a/solr/webapp/web/img/filetypes/c.png b/solr/webapp/web/ui/img/filetypes/c.png
similarity index 100%
rename from solr/webapp/web/img/filetypes/c.png
rename to solr/webapp/web/ui/img/filetypes/c.png
diff --git a/solr/webapp/web/img/filetypes/cfc.png b/solr/webapp/web/ui/img/filetypes/cfc.png
similarity index 100%
rename from solr/webapp/web/img/filetypes/cfc.png
rename to solr/webapp/web/ui/img/filetypes/cfc.png
diff --git a/solr/webapp/web/img/filetypes/cfm.png b/solr/webapp/web/ui/img/filetypes/cfm.png
similarity index 100%
rename from solr/webapp/web/img/filetypes/cfm.png
rename to solr/webapp/web/ui/img/filetypes/cfm.png
diff --git a/solr/webapp/web/img/filetypes/chm.png b/solr/webapp/web/ui/img/filetypes/chm.png
similarity index 100%
rename from solr/webapp/web/img/filetypes/chm.png
rename to solr/webapp/web/ui/img/filetypes/chm.png
diff --git a/solr/webapp/web/img/filetypes/class.png b/solr/webapp/web/ui/img/filetypes/class.png
similarity index 100%
rename from solr/webapp/web/img/filetypes/class.png
rename to solr/webapp/web/ui/img/filetypes/class.png
diff --git a/solr/webapp/web/img/filetypes/conf.png b/solr/webapp/web/ui/img/filetypes/conf.png
similarity index 100%
rename from solr/webapp/web/img/filetypes/conf.png
rename to solr/webapp/web/ui/img/filetypes/conf.png
diff --git a/solr/webapp/web/img/filetypes/cpp.png b/solr/webapp/web/ui/img/filetypes/cpp.png
similarity index 100%
rename from solr/webapp/web/img/filetypes/cpp.png
rename to solr/webapp/web/ui/img/filetypes/cpp.png
diff --git a/solr/webapp/web/img/filetypes/cs.png b/solr/webapp/web/ui/img/filetypes/cs.png
similarity index 100%
rename from solr/webapp/web/img/filetypes/cs.png
rename to solr/webapp/web/ui/img/filetypes/cs.png
diff --git a/solr/webapp/web/img/filetypes/css.png b/solr/webapp/web/ui/img/filetypes/css.png
similarity index 100%
rename from solr/webapp/web/img/filetypes/css.png
rename to solr/webapp/web/ui/img/filetypes/css.png
diff --git a/solr/webapp/web/img/filetypes/csv.png b/solr/webapp/web/ui/img/filetypes/csv.png
similarity index 100%
rename from solr/webapp/web/img/filetypes/csv.png
rename to solr/webapp/web/ui/img/filetypes/csv.png
diff --git a/solr/webapp/web/img/filetypes/deb.png b/solr/webapp/web/ui/img/filetypes/deb.png
similarity index 100%
rename from solr/webapp/web/img/filetypes/deb.png
rename to solr/webapp/web/ui/img/filetypes/deb.png
diff --git a/solr/webapp/web/img/filetypes/divx.png b/solr/webapp/web/ui/img/filetypes/divx.png
similarity index 100%
rename from solr/webapp/web/img/filetypes/divx.png
rename to solr/webapp/web/ui/img/filetypes/divx.png
diff --git a/solr/webapp/web/img/filetypes/doc.png b/solr/webapp/web/ui/img/filetypes/doc.png
similarity index 100%
rename from solr/webapp/web/img/filetypes/doc.png
rename to solr/webapp/web/ui/img/filetypes/doc.png
diff --git a/solr/webapp/web/img/filetypes/dot.png b/solr/webapp/web/ui/img/filetypes/dot.png
similarity index 100%
rename from solr/webapp/web/img/filetypes/dot.png
rename to solr/webapp/web/ui/img/filetypes/dot.png
diff --git a/solr/webapp/web/img/filetypes/eml.png b/solr/webapp/web/ui/img/filetypes/eml.png
similarity index 100%
rename from solr/webapp/web/img/filetypes/eml.png
rename to solr/webapp/web/ui/img/filetypes/eml.png
diff --git a/solr/webapp/web/img/filetypes/enc.png b/solr/webapp/web/ui/img/filetypes/enc.png
similarity index 100%
rename from solr/webapp/web/img/filetypes/enc.png
rename to solr/webapp/web/ui/img/filetypes/enc.png
diff --git a/solr/webapp/web/img/filetypes/file.png b/solr/webapp/web/ui/img/filetypes/file.png
similarity index 100%
rename from solr/webapp/web/img/filetypes/file.png
rename to solr/webapp/web/ui/img/filetypes/file.png
diff --git a/solr/webapp/web/img/filetypes/gif.png b/solr/webapp/web/ui/img/filetypes/gif.png
similarity index 100%
rename from solr/webapp/web/img/filetypes/gif.png
rename to solr/webapp/web/ui/img/filetypes/gif.png
diff --git a/solr/webapp/web/img/filetypes/gz.png b/solr/webapp/web/ui/img/filetypes/gz.png
similarity index 100%
rename from solr/webapp/web/img/filetypes/gz.png
rename to solr/webapp/web/ui/img/filetypes/gz.png
diff --git a/solr/webapp/web/img/filetypes/hlp.png b/solr/webapp/web/ui/img/filetypes/hlp.png
similarity index 100%
rename from solr/webapp/web/img/filetypes/hlp.png
rename to solr/webapp/web/ui/img/filetypes/hlp.png
diff --git a/solr/webapp/web/img/filetypes/htm.png b/solr/webapp/web/ui/img/filetypes/htm.png
similarity index 100%
rename from solr/webapp/web/img/filetypes/htm.png
rename to solr/webapp/web/ui/img/filetypes/htm.png
diff --git a/solr/webapp/web/img/filetypes/html.png b/solr/webapp/web/ui/img/filetypes/html.png
similarity index 100%
rename from solr/webapp/web/img/filetypes/html.png
rename to solr/webapp/web/ui/img/filetypes/html.png
diff --git a/solr/webapp/web/img/filetypes/image.png b/solr/webapp/web/ui/img/filetypes/image.png
similarity index 100%
rename from solr/webapp/web/img/filetypes/image.png
rename to solr/webapp/web/ui/img/filetypes/image.png
diff --git a/solr/webapp/web/img/filetypes/iso.png b/solr/webapp/web/ui/img/filetypes/iso.png
similarity index 100%
rename from solr/webapp/web/img/filetypes/iso.png
rename to solr/webapp/web/ui/img/filetypes/iso.png
diff --git a/solr/webapp/web/img/filetypes/jar.png b/solr/webapp/web/ui/img/filetypes/jar.png
similarity index 100%
rename from solr/webapp/web/img/filetypes/jar.png
rename to solr/webapp/web/ui/img/filetypes/jar.png
diff --git a/solr/webapp/web/img/filetypes/java.png b/solr/webapp/web/ui/img/filetypes/java.png
similarity index 100%
rename from solr/webapp/web/img/filetypes/java.png
rename to solr/webapp/web/ui/img/filetypes/java.png
diff --git a/solr/webapp/web/img/filetypes/jpeg.png b/solr/webapp/web/ui/img/filetypes/jpeg.png
similarity index 100%
rename from solr/webapp/web/img/filetypes/jpeg.png
rename to solr/webapp/web/ui/img/filetypes/jpeg.png
diff --git a/solr/webapp/web/img/filetypes/jpg.png b/solr/webapp/web/ui/img/filetypes/jpg.png
similarity index 100%
rename from solr/webapp/web/img/filetypes/jpg.png
rename to solr/webapp/web/ui/img/filetypes/jpg.png
diff --git a/solr/webapp/web/img/filetypes/js.png b/solr/webapp/web/ui/img/filetypes/js.png
similarity index 100%
rename from solr/webapp/web/img/filetypes/js.png
rename to solr/webapp/web/ui/img/filetypes/js.png
diff --git a/solr/webapp/web/img/filetypes/lua.png b/solr/webapp/web/ui/img/filetypes/lua.png
similarity index 100%
rename from solr/webapp/web/img/filetypes/lua.png
rename to solr/webapp/web/ui/img/filetypes/lua.png
diff --git a/solr/webapp/web/img/filetypes/m.png b/solr/webapp/web/ui/img/filetypes/m.png
similarity index 100%
rename from solr/webapp/web/img/filetypes/m.png
rename to solr/webapp/web/ui/img/filetypes/m.png
diff --git a/solr/webapp/web/img/filetypes/mm.png b/solr/webapp/web/ui/img/filetypes/mm.png
similarity index 100%
rename from solr/webapp/web/img/filetypes/mm.png
rename to solr/webapp/web/ui/img/filetypes/mm.png
diff --git a/solr/webapp/web/img/filetypes/mov.png b/solr/webapp/web/ui/img/filetypes/mov.png
similarity index 100%
rename from solr/webapp/web/img/filetypes/mov.png
rename to solr/webapp/web/ui/img/filetypes/mov.png
diff --git a/solr/webapp/web/img/filetypes/mp3.png b/solr/webapp/web/ui/img/filetypes/mp3.png
similarity index 100%
rename from solr/webapp/web/img/filetypes/mp3.png
rename to solr/webapp/web/ui/img/filetypes/mp3.png
diff --git a/solr/webapp/web/img/filetypes/mpg.png b/solr/webapp/web/ui/img/filetypes/mpg.png
similarity index 100%
rename from solr/webapp/web/img/filetypes/mpg.png
rename to solr/webapp/web/ui/img/filetypes/mpg.png
diff --git a/solr/webapp/web/img/filetypes/odc.png b/solr/webapp/web/ui/img/filetypes/odc.png
similarity index 100%
rename from solr/webapp/web/img/filetypes/odc.png
rename to solr/webapp/web/ui/img/filetypes/odc.png
diff --git a/solr/webapp/web/img/filetypes/odf.png b/solr/webapp/web/ui/img/filetypes/odf.png
similarity index 100%
rename from solr/webapp/web/img/filetypes/odf.png
rename to solr/webapp/web/ui/img/filetypes/odf.png
diff --git a/solr/webapp/web/img/filetypes/odg.png b/solr/webapp/web/ui/img/filetypes/odg.png
similarity index 100%
rename from solr/webapp/web/img/filetypes/odg.png
rename to solr/webapp/web/ui/img/filetypes/odg.png
diff --git a/solr/webapp/web/img/filetypes/odi.png b/solr/webapp/web/ui/img/filetypes/odi.png
similarity index 100%
rename from solr/webapp/web/img/filetypes/odi.png
rename to solr/webapp/web/ui/img/filetypes/odi.png
diff --git a/solr/webapp/web/img/filetypes/odp.png b/solr/webapp/web/ui/img/filetypes/odp.png
similarity index 100%
rename from solr/webapp/web/img/filetypes/odp.png
rename to solr/webapp/web/ui/img/filetypes/odp.png
diff --git a/solr/webapp/web/img/filetypes/ods.png b/solr/webapp/web/ui/img/filetypes/ods.png
similarity index 100%
rename from solr/webapp/web/img/filetypes/ods.png
rename to solr/webapp/web/ui/img/filetypes/ods.png
diff --git a/solr/webapp/web/img/filetypes/odt.png b/solr/webapp/web/ui/img/filetypes/odt.png
similarity index 100%
rename from solr/webapp/web/img/filetypes/odt.png
rename to solr/webapp/web/ui/img/filetypes/odt.png
diff --git a/solr/webapp/web/img/filetypes/ogg.png b/solr/webapp/web/ui/img/filetypes/ogg.png
similarity index 100%
rename from solr/webapp/web/img/filetypes/ogg.png
rename to solr/webapp/web/ui/img/filetypes/ogg.png
diff --git a/solr/webapp/web/img/filetypes/pdf.png b/solr/webapp/web/ui/img/filetypes/pdf.png
similarity index 100%
rename from solr/webapp/web/img/filetypes/pdf.png
rename to solr/webapp/web/ui/img/filetypes/pdf.png
diff --git a/solr/webapp/web/img/filetypes/pgp.png b/solr/webapp/web/ui/img/filetypes/pgp.png
similarity index 100%
rename from solr/webapp/web/img/filetypes/pgp.png
rename to solr/webapp/web/ui/img/filetypes/pgp.png
diff --git a/solr/webapp/web/img/filetypes/php.png b/solr/webapp/web/ui/img/filetypes/php.png
similarity index 100%
rename from solr/webapp/web/img/filetypes/php.png
rename to solr/webapp/web/ui/img/filetypes/php.png
diff --git a/solr/webapp/web/img/filetypes/pl.png b/solr/webapp/web/ui/img/filetypes/pl.png
similarity index 100%
rename from solr/webapp/web/img/filetypes/pl.png
rename to solr/webapp/web/ui/img/filetypes/pl.png
diff --git a/solr/webapp/web/img/filetypes/png.png b/solr/webapp/web/ui/img/filetypes/png.png
similarity index 100%
rename from solr/webapp/web/img/filetypes/png.png
rename to solr/webapp/web/ui/img/filetypes/png.png
diff --git a/solr/webapp/web/img/filetypes/ppt.png b/solr/webapp/web/ui/img/filetypes/ppt.png
similarity index 100%
rename from solr/webapp/web/img/filetypes/ppt.png
rename to solr/webapp/web/ui/img/filetypes/ppt.png
diff --git a/solr/webapp/web/img/filetypes/ps.png b/solr/webapp/web/ui/img/filetypes/ps.png
similarity index 100%
rename from solr/webapp/web/img/filetypes/ps.png
rename to solr/webapp/web/ui/img/filetypes/ps.png
diff --git a/solr/webapp/web/img/filetypes/py.png b/solr/webapp/web/ui/img/filetypes/py.png
similarity index 100%
rename from solr/webapp/web/img/filetypes/py.png
rename to solr/webapp/web/ui/img/filetypes/py.png
diff --git a/solr/webapp/web/img/filetypes/ram.png b/solr/webapp/web/ui/img/filetypes/ram.png
similarity index 100%
rename from solr/webapp/web/img/filetypes/ram.png
rename to solr/webapp/web/ui/img/filetypes/ram.png
diff --git a/solr/webapp/web/img/filetypes/rar.png b/solr/webapp/web/ui/img/filetypes/rar.png
similarity index 100%
rename from solr/webapp/web/img/filetypes/rar.png
rename to solr/webapp/web/ui/img/filetypes/rar.png
diff --git a/solr/webapp/web/img/filetypes/rb.png b/solr/webapp/web/ui/img/filetypes/rb.png
similarity index 100%
rename from solr/webapp/web/img/filetypes/rb.png
rename to solr/webapp/web/ui/img/filetypes/rb.png
diff --git a/solr/webapp/web/img/filetypes/rm.png b/solr/webapp/web/ui/img/filetypes/rm.png
similarity index 100%
rename from solr/webapp/web/img/filetypes/rm.png
rename to solr/webapp/web/ui/img/filetypes/rm.png
diff --git a/solr/webapp/web/img/filetypes/rpm.png b/solr/webapp/web/ui/img/filetypes/rpm.png
similarity index 100%
rename from solr/webapp/web/img/filetypes/rpm.png
rename to solr/webapp/web/ui/img/filetypes/rpm.png
diff --git a/solr/webapp/web/img/filetypes/rtf.png b/solr/webapp/web/ui/img/filetypes/rtf.png
similarity index 100%
rename from solr/webapp/web/img/filetypes/rtf.png
rename to solr/webapp/web/ui/img/filetypes/rtf.png
diff --git a/solr/webapp/web/img/filetypes/sig.png b/solr/webapp/web/ui/img/filetypes/sig.png
similarity index 100%
rename from solr/webapp/web/img/filetypes/sig.png
rename to solr/webapp/web/ui/img/filetypes/sig.png
diff --git a/solr/webapp/web/img/filetypes/sql.png b/solr/webapp/web/ui/img/filetypes/sql.png
similarity index 100%
rename from solr/webapp/web/img/filetypes/sql.png
rename to solr/webapp/web/ui/img/filetypes/sql.png
diff --git a/solr/webapp/web/img/filetypes/swf.png b/solr/webapp/web/ui/img/filetypes/swf.png
similarity index 100%
rename from solr/webapp/web/img/filetypes/swf.png
rename to solr/webapp/web/ui/img/filetypes/swf.png
diff --git a/solr/webapp/web/img/filetypes/sxc.png b/solr/webapp/web/ui/img/filetypes/sxc.png
similarity index 100%
rename from solr/webapp/web/img/filetypes/sxc.png
rename to solr/webapp/web/ui/img/filetypes/sxc.png
diff --git a/solr/webapp/web/img/filetypes/sxd.png b/solr/webapp/web/ui/img/filetypes/sxd.png
similarity index 100%
rename from solr/webapp/web/img/filetypes/sxd.png
rename to solr/webapp/web/ui/img/filetypes/sxd.png
diff --git a/solr/webapp/web/img/filetypes/sxi.png b/solr/webapp/web/ui/img/filetypes/sxi.png
similarity index 100%
rename from solr/webapp/web/img/filetypes/sxi.png
rename to solr/webapp/web/ui/img/filetypes/sxi.png
diff --git a/solr/webapp/web/img/filetypes/sxw.png b/solr/webapp/web/ui/img/filetypes/sxw.png
similarity index 100%
rename from solr/webapp/web/img/filetypes/sxw.png
rename to solr/webapp/web/ui/img/filetypes/sxw.png
diff --git a/solr/webapp/web/img/filetypes/tar.png b/solr/webapp/web/ui/img/filetypes/tar.png
similarity index 100%
rename from solr/webapp/web/img/filetypes/tar.png
rename to solr/webapp/web/ui/img/filetypes/tar.png
diff --git a/solr/webapp/web/img/filetypes/tex.png b/solr/webapp/web/ui/img/filetypes/tex.png
similarity index 100%
rename from solr/webapp/web/img/filetypes/tex.png
rename to solr/webapp/web/ui/img/filetypes/tex.png
diff --git a/solr/webapp/web/img/filetypes/tgz.png b/solr/webapp/web/ui/img/filetypes/tgz.png
similarity index 100%
rename from solr/webapp/web/img/filetypes/tgz.png
rename to solr/webapp/web/ui/img/filetypes/tgz.png
diff --git a/solr/webapp/web/img/filetypes/txt.png b/solr/webapp/web/ui/img/filetypes/txt.png
similarity index 100%
rename from solr/webapp/web/img/filetypes/txt.png
rename to solr/webapp/web/ui/img/filetypes/txt.png
diff --git a/solr/webapp/web/img/filetypes/vcf.png b/solr/webapp/web/ui/img/filetypes/vcf.png
similarity index 100%
rename from solr/webapp/web/img/filetypes/vcf.png
rename to solr/webapp/web/ui/img/filetypes/vcf.png
diff --git a/solr/webapp/web/img/filetypes/video.png b/solr/webapp/web/ui/img/filetypes/video.png
similarity index 100%
rename from solr/webapp/web/img/filetypes/video.png
rename to solr/webapp/web/ui/img/filetypes/video.png
diff --git a/solr/webapp/web/img/filetypes/vsd.png b/solr/webapp/web/ui/img/filetypes/vsd.png
similarity index 100%
rename from solr/webapp/web/img/filetypes/vsd.png
rename to solr/webapp/web/ui/img/filetypes/vsd.png
diff --git a/solr/webapp/web/img/filetypes/wav.png b/solr/webapp/web/ui/img/filetypes/wav.png
similarity index 100%
rename from solr/webapp/web/img/filetypes/wav.png
rename to solr/webapp/web/ui/img/filetypes/wav.png
diff --git a/solr/webapp/web/img/filetypes/wma.png b/solr/webapp/web/ui/img/filetypes/wma.png
similarity index 100%
rename from solr/webapp/web/img/filetypes/wma.png
rename to solr/webapp/web/ui/img/filetypes/wma.png
diff --git a/solr/webapp/web/img/filetypes/wmv.png b/solr/webapp/web/ui/img/filetypes/wmv.png
similarity index 100%
rename from solr/webapp/web/img/filetypes/wmv.png
rename to solr/webapp/web/ui/img/filetypes/wmv.png
diff --git a/solr/webapp/web/img/filetypes/xls.png b/solr/webapp/web/ui/img/filetypes/xls.png
similarity index 100%
rename from solr/webapp/web/img/filetypes/xls.png
rename to solr/webapp/web/ui/img/filetypes/xls.png
diff --git a/solr/webapp/web/img/filetypes/xml.png b/solr/webapp/web/ui/img/filetypes/xml.png
similarity index 100%
rename from solr/webapp/web/img/filetypes/xml.png
rename to solr/webapp/web/ui/img/filetypes/xml.png
diff --git a/solr/webapp/web/img/filetypes/xpi.png b/solr/webapp/web/ui/img/filetypes/xpi.png
similarity index 100%
rename from solr/webapp/web/img/filetypes/xpi.png
rename to solr/webapp/web/ui/img/filetypes/xpi.png
diff --git a/solr/webapp/web/img/filetypes/xvid.png b/solr/webapp/web/ui/img/filetypes/xvid.png
similarity index 100%
rename from solr/webapp/web/img/filetypes/xvid.png
rename to solr/webapp/web/ui/img/filetypes/xvid.png
diff --git a/solr/webapp/web/img/filetypes/zip.png b/solr/webapp/web/ui/img/filetypes/zip.png
similarity index 100%
rename from solr/webapp/web/img/filetypes/zip.png
rename to solr/webapp/web/ui/img/filetypes/zip.png
diff --git a/solr/webapp/web/img/ico/arrow-000-small.png b/solr/webapp/web/ui/img/ico/arrow-000-small.png
similarity index 100%
rename from solr/webapp/web/img/ico/arrow-000-small.png
rename to solr/webapp/web/ui/img/ico/arrow-000-small.png
diff --git a/solr/webapp/web/img/ico/arrow-circle.png b/solr/webapp/web/ui/img/ico/arrow-circle.png
similarity index 100%
rename from solr/webapp/web/img/ico/arrow-circle.png
rename to solr/webapp/web/ui/img/ico/arrow-circle.png
diff --git a/solr/webapp/web/img/ico/arrow-switch.png b/solr/webapp/web/ui/img/ico/arrow-switch.png
similarity index 100%
rename from solr/webapp/web/img/ico/arrow-switch.png
rename to solr/webapp/web/ui/img/ico/arrow-switch.png
diff --git a/solr/webapp/web/img/ico/asterisk.png b/solr/webapp/web/ui/img/ico/asterisk.png
similarity index 100%
rename from solr/webapp/web/img/ico/asterisk.png
rename to solr/webapp/web/ui/img/ico/asterisk.png
diff --git a/solr/webapp/web/img/ico/battery.png b/solr/webapp/web/ui/img/ico/battery.png
similarity index 100%
rename from solr/webapp/web/img/ico/battery.png
rename to solr/webapp/web/ui/img/ico/battery.png
diff --git a/solr/webapp/web/img/ico/block-small.png b/solr/webapp/web/ui/img/ico/block-small.png
similarity index 100%
rename from solr/webapp/web/img/ico/block-small.png
rename to solr/webapp/web/ui/img/ico/block-small.png
diff --git a/solr/webapp/web/img/ico/block.png b/solr/webapp/web/ui/img/ico/block.png
similarity index 100%
rename from solr/webapp/web/img/ico/block.png
rename to solr/webapp/web/ui/img/ico/block.png
diff --git a/solr/webapp/web/img/ico/book-open-text.png b/solr/webapp/web/ui/img/ico/book-open-text.png
similarity index 100%
rename from solr/webapp/web/img/ico/book-open-text.png
rename to solr/webapp/web/ui/img/ico/book-open-text.png
diff --git a/solr/webapp/web/img/ico/box.png b/solr/webapp/web/ui/img/ico/box.png
similarity index 100%
rename from solr/webapp/web/img/ico/box.png
rename to solr/webapp/web/ui/img/ico/box.png
diff --git a/solr/webapp/web/img/ico/bug.png b/solr/webapp/web/ui/img/ico/bug.png
similarity index 100%
rename from solr/webapp/web/img/ico/bug.png
rename to solr/webapp/web/ui/img/ico/bug.png
diff --git a/solr/webapp/web/img/ico/chart.png b/solr/webapp/web/ui/img/ico/chart.png
similarity index 100%
rename from solr/webapp/web/img/ico/chart.png
rename to solr/webapp/web/ui/img/ico/chart.png
diff --git a/solr/webapp/web/img/ico/chevron-small-expand.png b/solr/webapp/web/ui/img/ico/chevron-small-expand.png
similarity index 100%
rename from solr/webapp/web/img/ico/chevron-small-expand.png
rename to solr/webapp/web/ui/img/ico/chevron-small-expand.png
diff --git a/solr/webapp/web/img/ico/chevron-small.png b/solr/webapp/web/ui/img/ico/chevron-small.png
similarity index 100%
rename from solr/webapp/web/img/ico/chevron-small.png
rename to solr/webapp/web/ui/img/ico/chevron-small.png
diff --git a/solr/webapp/web/img/ico/clipboard-list.png b/solr/webapp/web/ui/img/ico/clipboard-list.png
similarity index 100%
rename from solr/webapp/web/img/ico/clipboard-list.png
rename to solr/webapp/web/ui/img/ico/clipboard-list.png
diff --git a/solr/webapp/web/img/ico/clipboard-paste-document-text.png b/solr/webapp/web/ui/img/ico/clipboard-paste-document-text.png
similarity index 100%
rename from solr/webapp/web/img/ico/clipboard-paste-document-text.png
rename to solr/webapp/web/ui/img/ico/clipboard-paste-document-text.png
diff --git a/solr/webapp/web/img/ico/clipboard-paste.png b/solr/webapp/web/ui/img/ico/clipboard-paste.png
similarity index 100%
rename from solr/webapp/web/img/ico/clipboard-paste.png
rename to solr/webapp/web/ui/img/ico/clipboard-paste.png
diff --git a/solr/webapp/web/img/ico/clock-select-remain.png b/solr/webapp/web/ui/img/ico/clock-select-remain.png
similarity index 100%
rename from solr/webapp/web/img/ico/clock-select-remain.png
rename to solr/webapp/web/ui/img/ico/clock-select-remain.png
diff --git a/solr/webapp/web/img/ico/clock-select.png b/solr/webapp/web/ui/img/ico/clock-select.png
similarity index 100%
rename from solr/webapp/web/img/ico/clock-select.png
rename to solr/webapp/web/ui/img/ico/clock-select.png
diff --git a/solr/webapp/web/img/ico/construction.png b/solr/webapp/web/ui/img/ico/construction.png
similarity index 100%
rename from solr/webapp/web/img/ico/construction.png
rename to solr/webapp/web/ui/img/ico/construction.png
diff --git a/solr/webapp/web/img/ico/cross-0.png b/solr/webapp/web/ui/img/ico/cross-0.png
similarity index 100%
rename from solr/webapp/web/img/ico/cross-0.png
rename to solr/webapp/web/ui/img/ico/cross-0.png
diff --git a/solr/webapp/web/img/ico/cross-1.png b/solr/webapp/web/ui/img/ico/cross-1.png
similarity index 100%
rename from solr/webapp/web/img/ico/cross-1.png
rename to solr/webapp/web/ui/img/ico/cross-1.png
diff --git a/solr/webapp/web/img/ico/cross-button.png b/solr/webapp/web/ui/img/ico/cross-button.png
similarity index 100%
rename from solr/webapp/web/img/ico/cross-button.png
rename to solr/webapp/web/ui/img/ico/cross-button.png
diff --git a/solr/webapp/web/img/ico/cross.png b/solr/webapp/web/ui/img/ico/cross.png
similarity index 100%
rename from solr/webapp/web/img/ico/cross.png
rename to solr/webapp/web/ui/img/ico/cross.png
diff --git a/solr/webapp/web/img/ico/dashboard.png b/solr/webapp/web/ui/img/ico/dashboard.png
similarity index 100%
rename from solr/webapp/web/img/ico/dashboard.png
rename to solr/webapp/web/ui/img/ico/dashboard.png
diff --git a/solr/webapp/web/img/ico/database--plus.png b/solr/webapp/web/ui/img/ico/database--plus.png
similarity index 100%
rename from solr/webapp/web/img/ico/database--plus.png
rename to solr/webapp/web/ui/img/ico/database--plus.png
diff --git a/solr/webapp/web/img/ico/database.png b/solr/webapp/web/ui/img/ico/database.png
similarity index 100%
rename from solr/webapp/web/img/ico/database.png
rename to solr/webapp/web/ui/img/ico/database.png
diff --git a/solr/webapp/web/img/ico/databases.png b/solr/webapp/web/ui/img/ico/databases.png
similarity index 100%
rename from solr/webapp/web/img/ico/databases.png
rename to solr/webapp/web/ui/img/ico/databases.png
diff --git a/solr/webapp/web/img/ico/disk-black.png b/solr/webapp/web/ui/img/ico/disk-black.png
similarity index 100%
rename from solr/webapp/web/img/ico/disk-black.png
rename to solr/webapp/web/ui/img/ico/disk-black.png
diff --git a/solr/webapp/web/img/ico/document-convert.png b/solr/webapp/web/ui/img/ico/document-convert.png
similarity index 100%
rename from solr/webapp/web/img/ico/document-convert.png
rename to solr/webapp/web/ui/img/ico/document-convert.png
diff --git a/solr/webapp/web/img/ico/document-import.png b/solr/webapp/web/ui/img/ico/document-import.png
similarity index 100%
rename from solr/webapp/web/img/ico/document-import.png
rename to solr/webapp/web/ui/img/ico/document-import.png
diff --git a/solr/webapp/web/img/ico/document-list.png b/solr/webapp/web/ui/img/ico/document-list.png
similarity index 100%
rename from solr/webapp/web/img/ico/document-list.png
rename to solr/webapp/web/ui/img/ico/document-list.png
diff --git a/solr/webapp/web/img/ico/document-text.png b/solr/webapp/web/ui/img/ico/document-text.png
similarity index 100%
rename from solr/webapp/web/img/ico/document-text.png
rename to solr/webapp/web/ui/img/ico/document-text.png
diff --git a/solr/webapp/web/img/ico/documents-stack.png b/solr/webapp/web/ui/img/ico/documents-stack.png
similarity index 100%
rename from solr/webapp/web/img/ico/documents-stack.png
rename to solr/webapp/web/ui/img/ico/documents-stack.png
diff --git a/solr/webapp/web/img/ico/download-cloud.png b/solr/webapp/web/ui/img/ico/download-cloud.png
similarity index 100%
rename from solr/webapp/web/img/ico/download-cloud.png
rename to solr/webapp/web/ui/img/ico/download-cloud.png
diff --git a/solr/webapp/web/img/ico/drive-upload.png b/solr/webapp/web/ui/img/ico/drive-upload.png
similarity index 100%
rename from solr/webapp/web/img/ico/drive-upload.png
rename to solr/webapp/web/ui/img/ico/drive-upload.png
diff --git a/solr/webapp/web/img/ico/exclamation-button.png b/solr/webapp/web/ui/img/ico/exclamation-button.png
similarity index 100%
rename from solr/webapp/web/img/ico/exclamation-button.png
rename to solr/webapp/web/ui/img/ico/exclamation-button.png
diff --git a/solr/webapp/web/img/ico/eye.png b/solr/webapp/web/ui/img/ico/eye.png
similarity index 100%
rename from solr/webapp/web/img/ico/eye.png
rename to solr/webapp/web/ui/img/ico/eye.png
diff --git a/solr/webapp/web/img/ico/folder-export.png b/solr/webapp/web/ui/img/ico/folder-export.png
similarity index 100%
rename from solr/webapp/web/img/ico/folder-export.png
rename to solr/webapp/web/ui/img/ico/folder-export.png
diff --git a/solr/webapp/web/img/ico/folder-tree.png b/solr/webapp/web/ui/img/ico/folder-tree.png
similarity index 100%
rename from solr/webapp/web/img/ico/folder-tree.png
rename to solr/webapp/web/ui/img/ico/folder-tree.png
diff --git a/solr/webapp/web/img/ico/folder.png b/solr/webapp/web/ui/img/ico/folder.png
similarity index 100%
rename from solr/webapp/web/img/ico/folder.png
rename to solr/webapp/web/ui/img/ico/folder.png
diff --git a/solr/webapp/web/img/ico/funnel-small.png b/solr/webapp/web/ui/img/ico/funnel-small.png
similarity index 100%
rename from solr/webapp/web/img/ico/funnel-small.png
rename to solr/webapp/web/ui/img/ico/funnel-small.png
diff --git a/solr/webapp/web/img/ico/funnel.png b/solr/webapp/web/ui/img/ico/funnel.png
similarity index 100%
rename from solr/webapp/web/img/ico/funnel.png
rename to solr/webapp/web/ui/img/ico/funnel.png
diff --git a/solr/webapp/web/img/ico/gear.png b/solr/webapp/web/ui/img/ico/gear.png
similarity index 100%
rename from solr/webapp/web/img/ico/gear.png
rename to solr/webapp/web/ui/img/ico/gear.png
diff --git a/solr/webapp/web/img/ico/globe-network.png b/solr/webapp/web/ui/img/ico/globe-network.png
similarity index 100%
rename from solr/webapp/web/img/ico/globe-network.png
rename to solr/webapp/web/ui/img/ico/globe-network.png
diff --git a/solr/webapp/web/img/ico/globe.png b/solr/webapp/web/ui/img/ico/globe.png
similarity index 100%
rename from solr/webapp/web/img/ico/globe.png
rename to solr/webapp/web/ui/img/ico/globe.png
diff --git a/solr/webapp/web/img/ico/hammer-screwdriver.png b/solr/webapp/web/ui/img/ico/hammer-screwdriver.png
similarity index 100%
rename from solr/webapp/web/img/ico/hammer-screwdriver.png
rename to solr/webapp/web/ui/img/ico/hammer-screwdriver.png
diff --git a/solr/webapp/web/img/ico/hammer.png b/solr/webapp/web/ui/img/ico/hammer.png
similarity index 100%
rename from solr/webapp/web/img/ico/hammer.png
rename to solr/webapp/web/ui/img/ico/hammer.png
diff --git a/solr/webapp/web/img/ico/hand.png b/solr/webapp/web/ui/img/ico/hand.png
similarity index 100%
rename from solr/webapp/web/img/ico/hand.png
rename to solr/webapp/web/ui/img/ico/hand.png
diff --git a/solr/webapp/web/img/ico/highlighter-text.png b/solr/webapp/web/ui/img/ico/highlighter-text.png
similarity index 100%
rename from solr/webapp/web/img/ico/highlighter-text.png
rename to solr/webapp/web/ui/img/ico/highlighter-text.png
diff --git a/solr/webapp/web/img/ico/home.png b/solr/webapp/web/ui/img/ico/home.png
similarity index 100%
rename from solr/webapp/web/img/ico/home.png
rename to solr/webapp/web/ui/img/ico/home.png
diff --git a/solr/webapp/web/img/ico/hourglass--exclamation.png b/solr/webapp/web/ui/img/ico/hourglass--exclamation.png
similarity index 100%
rename from solr/webapp/web/img/ico/hourglass--exclamation.png
rename to solr/webapp/web/ui/img/ico/hourglass--exclamation.png
diff --git a/solr/webapp/web/img/ico/hourglass.png b/solr/webapp/web/ui/img/ico/hourglass.png
similarity index 100%
rename from solr/webapp/web/img/ico/hourglass.png
rename to solr/webapp/web/ui/img/ico/hourglass.png
diff --git a/solr/webapp/web/img/ico/inbox-document-text.png b/solr/webapp/web/ui/img/ico/inbox-document-text.png
similarity index 100%
rename from solr/webapp/web/img/ico/inbox-document-text.png
rename to solr/webapp/web/ui/img/ico/inbox-document-text.png
diff --git a/solr/webapp/web/img/ico/information-button.png b/solr/webapp/web/ui/img/ico/information-button.png
similarity index 100%
rename from solr/webapp/web/img/ico/information-button.png
rename to solr/webapp/web/ui/img/ico/information-button.png
diff --git a/solr/webapp/web/img/ico/information-small.png b/solr/webapp/web/ui/img/ico/information-small.png
similarity index 100%
rename from solr/webapp/web/img/ico/information-small.png
rename to solr/webapp/web/ui/img/ico/information-small.png
diff --git a/solr/webapp/web/img/ico/information-white.png b/solr/webapp/web/ui/img/ico/information-white.png
similarity index 100%
rename from solr/webapp/web/img/ico/information-white.png
rename to solr/webapp/web/ui/img/ico/information-white.png
diff --git a/solr/webapp/web/img/ico/information.png b/solr/webapp/web/ui/img/ico/information.png
similarity index 100%
rename from solr/webapp/web/img/ico/information.png
rename to solr/webapp/web/ui/img/ico/information.png
diff --git a/solr/webapp/web/img/ico/jar.png b/solr/webapp/web/ui/img/ico/jar.png
similarity index 100%
rename from solr/webapp/web/img/ico/jar.png
rename to solr/webapp/web/ui/img/ico/jar.png
diff --git a/solr/webapp/web/img/ico/magnifier.png b/solr/webapp/web/ui/img/ico/magnifier.png
similarity index 100%
rename from solr/webapp/web/img/ico/magnifier.png
rename to solr/webapp/web/ui/img/ico/magnifier.png
diff --git a/solr/webapp/web/img/ico/mail.png b/solr/webapp/web/ui/img/ico/mail.png
similarity index 100%
rename from solr/webapp/web/img/ico/mail.png
rename to solr/webapp/web/ui/img/ico/mail.png
diff --git a/solr/webapp/web/img/ico/memory.png b/solr/webapp/web/ui/img/ico/memory.png
similarity index 100%
rename from solr/webapp/web/img/ico/memory.png
rename to solr/webapp/web/ui/img/ico/memory.png
diff --git a/solr/webapp/web/img/ico/minus-button.png b/solr/webapp/web/ui/img/ico/minus-button.png
similarity index 100%
rename from solr/webapp/web/img/ico/minus-button.png
rename to solr/webapp/web/ui/img/ico/minus-button.png
diff --git a/solr/webapp/web/img/ico/molecule.png b/solr/webapp/web/ui/img/ico/molecule.png
similarity index 100%
rename from solr/webapp/web/img/ico/molecule.png
rename to solr/webapp/web/ui/img/ico/molecule.png
diff --git a/solr/webapp/web/img/ico/network-cloud.png b/solr/webapp/web/ui/img/ico/network-cloud.png
similarity index 100%
rename from solr/webapp/web/img/ico/network-cloud.png
rename to solr/webapp/web/ui/img/ico/network-cloud.png
diff --git a/solr/webapp/web/img/ico/network-status-away.png b/solr/webapp/web/ui/img/ico/network-status-away.png
similarity index 100%
rename from solr/webapp/web/img/ico/network-status-away.png
rename to solr/webapp/web/ui/img/ico/network-status-away.png
diff --git a/solr/webapp/web/img/ico/network-status-busy.png b/solr/webapp/web/ui/img/ico/network-status-busy.png
similarity index 100%
rename from solr/webapp/web/img/ico/network-status-busy.png
rename to solr/webapp/web/ui/img/ico/network-status-busy.png
diff --git a/solr/webapp/web/img/ico/network-status-offline.png b/solr/webapp/web/ui/img/ico/network-status-offline.png
similarity index 100%
rename from solr/webapp/web/img/ico/network-status-offline.png
rename to solr/webapp/web/ui/img/ico/network-status-offline.png
diff --git a/solr/webapp/web/img/ico/network-status.png b/solr/webapp/web/ui/img/ico/network-status.png
similarity index 100%
rename from solr/webapp/web/img/ico/network-status.png
rename to solr/webapp/web/ui/img/ico/network-status.png
diff --git a/solr/webapp/web/img/ico/network.png b/solr/webapp/web/ui/img/ico/network.png
similarity index 100%
rename from solr/webapp/web/img/ico/network.png
rename to solr/webapp/web/ui/img/ico/network.png
diff --git a/solr/webapp/web/img/ico/node-design.png b/solr/webapp/web/ui/img/ico/node-design.png
similarity index 100%
rename from solr/webapp/web/img/ico/node-design.png
rename to solr/webapp/web/ui/img/ico/node-design.png
diff --git a/solr/webapp/web/img/ico/node-master.png b/solr/webapp/web/ui/img/ico/node-master.png
similarity index 100%
rename from solr/webapp/web/img/ico/node-master.png
rename to solr/webapp/web/ui/img/ico/node-master.png
diff --git a/solr/webapp/web/img/ico/node-select.png b/solr/webapp/web/ui/img/ico/node-select.png
similarity index 100%
rename from solr/webapp/web/img/ico/node-select.png
rename to solr/webapp/web/ui/img/ico/node-select.png
diff --git a/solr/webapp/web/img/ico/node-slave.png b/solr/webapp/web/ui/img/ico/node-slave.png
similarity index 100%
rename from solr/webapp/web/img/ico/node-slave.png
rename to solr/webapp/web/ui/img/ico/node-slave.png
diff --git a/solr/webapp/web/img/ico/node.png b/solr/webapp/web/ui/img/ico/node.png
similarity index 100%
rename from solr/webapp/web/img/ico/node.png
rename to solr/webapp/web/ui/img/ico/node.png
diff --git a/solr/webapp/web/img/ico/pencil-small.png b/solr/webapp/web/ui/img/ico/pencil-small.png
similarity index 100%
rename from solr/webapp/web/img/ico/pencil-small.png
rename to solr/webapp/web/ui/img/ico/pencil-small.png
diff --git a/solr/webapp/web/img/ico/pencil.png b/solr/webapp/web/ui/img/ico/pencil.png
similarity index 100%
rename from solr/webapp/web/img/ico/pencil.png
rename to solr/webapp/web/ui/img/ico/pencil.png
diff --git a/solr/webapp/web/img/ico/plus-button.png b/solr/webapp/web/ui/img/ico/plus-button.png
similarity index 100%
rename from solr/webapp/web/img/ico/plus-button.png
rename to solr/webapp/web/ui/img/ico/plus-button.png
diff --git a/solr/webapp/web/img/ico/processor.png b/solr/webapp/web/ui/img/ico/processor.png
similarity index 100%
rename from solr/webapp/web/img/ico/processor.png
rename to solr/webapp/web/ui/img/ico/processor.png
diff --git a/solr/webapp/web/img/ico/prohibition.png b/solr/webapp/web/ui/img/ico/prohibition.png
similarity index 100%
rename from solr/webapp/web/img/ico/prohibition.png
rename to solr/webapp/web/ui/img/ico/prohibition.png
diff --git a/solr/webapp/web/img/ico/property.png b/solr/webapp/web/ui/img/ico/property.png
similarity index 100%
rename from solr/webapp/web/img/ico/property.png
rename to solr/webapp/web/ui/img/ico/property.png
diff --git a/solr/webapp/web/img/ico/question-small-white.png b/solr/webapp/web/ui/img/ico/question-small-white.png
similarity index 100%
rename from solr/webapp/web/img/ico/question-small-white.png
rename to solr/webapp/web/ui/img/ico/question-small-white.png
diff --git a/solr/webapp/web/img/ico/question-white.png b/solr/webapp/web/ui/img/ico/question-white.png
similarity index 100%
rename from solr/webapp/web/img/ico/question-white.png
rename to solr/webapp/web/ui/img/ico/question-white.png
diff --git a/solr/webapp/web/img/ico/question.png b/solr/webapp/web/ui/img/ico/question.png
similarity index 100%
rename from solr/webapp/web/img/ico/question.png
rename to solr/webapp/web/ui/img/ico/question.png
diff --git a/solr/webapp/web/img/ico/receipt-invoice.png b/solr/webapp/web/ui/img/ico/receipt-invoice.png
similarity index 100%
rename from solr/webapp/web/img/ico/receipt-invoice.png
rename to solr/webapp/web/ui/img/ico/receipt-invoice.png
diff --git a/solr/webapp/web/img/ico/receipt.png b/solr/webapp/web/ui/img/ico/receipt.png
similarity index 100%
rename from solr/webapp/web/img/ico/receipt.png
rename to solr/webapp/web/ui/img/ico/receipt.png
diff --git a/solr/webapp/web/img/ico/script-code.png b/solr/webapp/web/ui/img/ico/script-code.png
similarity index 100%
rename from solr/webapp/web/img/ico/script-code.png
rename to solr/webapp/web/ui/img/ico/script-code.png
diff --git a/solr/webapp/web/img/ico/server-cast.png b/solr/webapp/web/ui/img/ico/server-cast.png
similarity index 100%
rename from solr/webapp/web/img/ico/server-cast.png
rename to solr/webapp/web/ui/img/ico/server-cast.png
diff --git a/solr/webapp/web/img/ico/server.png b/solr/webapp/web/ui/img/ico/server.png
similarity index 100%
rename from solr/webapp/web/img/ico/server.png
rename to solr/webapp/web/ui/img/ico/server.png
diff --git a/solr/webapp/web/img/ico/sitemap.png b/solr/webapp/web/ui/img/ico/sitemap.png
similarity index 100%
rename from solr/webapp/web/img/ico/sitemap.png
rename to solr/webapp/web/ui/img/ico/sitemap.png
diff --git a/solr/webapp/web/img/ico/slash.png b/solr/webapp/web/ui/img/ico/slash.png
similarity index 100%
rename from solr/webapp/web/img/ico/slash.png
rename to solr/webapp/web/ui/img/ico/slash.png
diff --git a/solr/webapp/web/img/ico/status-away.png b/solr/webapp/web/ui/img/ico/status-away.png
similarity index 100%
rename from solr/webapp/web/img/ico/status-away.png
rename to solr/webapp/web/ui/img/ico/status-away.png
diff --git a/solr/webapp/web/img/ico/status-busy.png b/solr/webapp/web/ui/img/ico/status-busy.png
similarity index 100%
rename from solr/webapp/web/img/ico/status-busy.png
rename to solr/webapp/web/ui/img/ico/status-busy.png
diff --git a/solr/webapp/web/img/ico/status-offline.png b/solr/webapp/web/ui/img/ico/status-offline.png
similarity index 100%
rename from solr/webapp/web/img/ico/status-offline.png
rename to solr/webapp/web/ui/img/ico/status-offline.png
diff --git a/solr/webapp/web/img/ico/status.png b/solr/webapp/web/ui/img/ico/status.png
similarity index 100%
rename from solr/webapp/web/img/ico/status.png
rename to solr/webapp/web/ui/img/ico/status.png
diff --git a/solr/webapp/web/img/ico/system-monitor--exclamation.png b/solr/webapp/web/ui/img/ico/system-monitor--exclamation.png
similarity index 100%
rename from solr/webapp/web/img/ico/system-monitor--exclamation.png
rename to solr/webapp/web/ui/img/ico/system-monitor--exclamation.png
diff --git a/solr/webapp/web/img/ico/system-monitor.png b/solr/webapp/web/ui/img/ico/system-monitor.png
similarity index 100%
rename from solr/webapp/web/img/ico/system-monitor.png
rename to solr/webapp/web/ui/img/ico/system-monitor.png
diff --git a/solr/webapp/web/img/ico/table.png b/solr/webapp/web/ui/img/ico/table.png
similarity index 100%
rename from solr/webapp/web/img/ico/table.png
rename to solr/webapp/web/ui/img/ico/table.png
diff --git a/solr/webapp/web/img/ico/terminal.png b/solr/webapp/web/ui/img/ico/terminal.png
similarity index 100%
rename from solr/webapp/web/img/ico/terminal.png
rename to solr/webapp/web/ui/img/ico/terminal.png
diff --git a/solr/webapp/web/img/ico/tick-circle.png b/solr/webapp/web/ui/img/ico/tick-circle.png
similarity index 100%
rename from solr/webapp/web/img/ico/tick-circle.png
rename to solr/webapp/web/ui/img/ico/tick-circle.png
diff --git a/solr/webapp/web/img/ico/tick-red.png b/solr/webapp/web/ui/img/ico/tick-red.png
similarity index 100%
rename from solr/webapp/web/img/ico/tick-red.png
rename to solr/webapp/web/ui/img/ico/tick-red.png
diff --git a/solr/webapp/web/img/ico/tick.png b/solr/webapp/web/ui/img/ico/tick.png
similarity index 100%
rename from solr/webapp/web/img/ico/tick.png
rename to solr/webapp/web/ui/img/ico/tick.png
diff --git a/solr/webapp/web/img/ico/toggle-small-expand.png b/solr/webapp/web/ui/img/ico/toggle-small-expand.png
similarity index 100%
rename from solr/webapp/web/img/ico/toggle-small-expand.png
rename to solr/webapp/web/ui/img/ico/toggle-small-expand.png
diff --git a/solr/webapp/web/img/ico/toggle-small.png b/solr/webapp/web/ui/img/ico/toggle-small.png
similarity index 100%
rename from solr/webapp/web/img/ico/toggle-small.png
rename to solr/webapp/web/ui/img/ico/toggle-small.png
diff --git a/solr/webapp/web/img/ico/toolbox.png b/solr/webapp/web/ui/img/ico/toolbox.png
similarity index 100%
rename from solr/webapp/web/img/ico/toolbox.png
rename to solr/webapp/web/ui/img/ico/toolbox.png
diff --git a/solr/webapp/web/img/ico/ui-accordion.png b/solr/webapp/web/ui/img/ico/ui-accordion.png
similarity index 100%
rename from solr/webapp/web/img/ico/ui-accordion.png
rename to solr/webapp/web/ui/img/ico/ui-accordion.png
diff --git a/solr/webapp/web/img/ico/ui-address-bar.png b/solr/webapp/web/ui/img/ico/ui-address-bar.png
similarity index 100%
rename from solr/webapp/web/img/ico/ui-address-bar.png
rename to solr/webapp/web/ui/img/ico/ui-address-bar.png
diff --git a/solr/webapp/web/img/ico/ui-check-box-uncheck.png b/solr/webapp/web/ui/img/ico/ui-check-box-uncheck.png
similarity index 100%
rename from solr/webapp/web/img/ico/ui-check-box-uncheck.png
rename to solr/webapp/web/ui/img/ico/ui-check-box-uncheck.png
diff --git a/solr/webapp/web/img/ico/ui-check-box.png b/solr/webapp/web/ui/img/ico/ui-check-box.png
similarity index 100%
rename from solr/webapp/web/img/ico/ui-check-box.png
rename to solr/webapp/web/ui/img/ico/ui-check-box.png
diff --git a/solr/webapp/web/img/ico/ui-radio-button-uncheck.png b/solr/webapp/web/ui/img/ico/ui-radio-button-uncheck.png
similarity index 100%
rename from solr/webapp/web/img/ico/ui-radio-button-uncheck.png
rename to solr/webapp/web/ui/img/ico/ui-radio-button-uncheck.png
diff --git a/solr/webapp/web/img/ico/ui-radio-button.png b/solr/webapp/web/ui/img/ico/ui-radio-button.png
similarity index 100%
rename from solr/webapp/web/img/ico/ui-radio-button.png
rename to solr/webapp/web/ui/img/ico/ui-radio-button.png
diff --git a/solr/webapp/web/img/ico/ui-text-field-select.png b/solr/webapp/web/ui/img/ico/ui-text-field-select.png
similarity index 100%
rename from solr/webapp/web/img/ico/ui-text-field-select.png
rename to solr/webapp/web/ui/img/ico/ui-text-field-select.png
diff --git a/solr/webapp/web/img/ico/users.png b/solr/webapp/web/ui/img/ico/users.png
similarity index 100%
rename from solr/webapp/web/img/ico/users.png
rename to solr/webapp/web/ui/img/ico/users.png
diff --git a/solr/webapp/web/img/ico/wooden-box.png b/solr/webapp/web/ui/img/ico/wooden-box.png
similarity index 100%
rename from solr/webapp/web/img/ico/wooden-box.png
rename to solr/webapp/web/ui/img/ico/wooden-box.png
diff --git a/solr/webapp/web/img/ico/zone.png b/solr/webapp/web/ui/img/ico/zone.png
similarity index 100%
rename from solr/webapp/web/img/ico/zone.png
rename to solr/webapp/web/ui/img/ico/zone.png
diff --git a/solr/webapp/web/img/loader-light.gif b/solr/webapp/web/ui/img/loader-light.gif
similarity index 100%
rename from solr/webapp/web/img/loader-light.gif
rename to solr/webapp/web/ui/img/loader-light.gif
diff --git a/solr/webapp/web/img/loader.gif b/solr/webapp/web/ui/img/loader.gif
similarity index 100%
rename from solr/webapp/web/img/loader.gif
rename to solr/webapp/web/ui/img/loader.gif
diff --git a/solr/webapp/web/img/lucene-ico.png b/solr/webapp/web/ui/img/lucene-ico.png
similarity index 100%
rename from solr/webapp/web/img/lucene-ico.png
rename to solr/webapp/web/ui/img/lucene-ico.png
diff --git a/solr/webapp/web/img/solr-ico.png b/solr/webapp/web/ui/img/solr-ico.png
similarity index 100%
rename from solr/webapp/web/img/solr-ico.png
rename to solr/webapp/web/ui/img/solr-ico.png
diff --git a/solr/webapp/web/img/solr.svg b/solr/webapp/web/ui/img/solr.svg
similarity index 100%
rename from solr/webapp/web/img/solr.svg
rename to solr/webapp/web/ui/img/solr.svg
diff --git a/solr/webapp/web/img/tree.png b/solr/webapp/web/ui/img/tree.png
similarity index 100%
rename from solr/webapp/web/img/tree.png
rename to solr/webapp/web/ui/img/tree.png
diff --git a/solr/webapp/web/index.html b/solr/webapp/web/ui/index.html
similarity index 98%
rename from solr/webapp/web/index.html
rename to solr/webapp/web/ui/index.html
index 2e01906..d9eefb6 100644
--- a/solr/webapp/web/index.html
+++ b/solr/webapp/web/ui/index.html
@@ -124,7 +124,7 @@ limitations under the License.
       </div>
 
       <div class="other-ui-link">
-        Use <a class="ul" href="/solr/old.html">original UI</a><a target="_blank" href="http://wiki.apache.org/solr/AngularUI">&nbsp;<span class="help"></span></a>
+        Use <a class="ul" href="/ui/old.html">original UI</a><a target="_blank" href="http://wiki.apache.org/solr/AngularUI">&nbsp;<span class="help"></span></a>
       </div>
 
       <div id="content-wrapper">
diff --git a/solr/webapp/web/js/angular/app.js b/solr/webapp/web/ui/js/angular/app.js
similarity index 100%
rename from solr/webapp/web/js/angular/app.js
rename to solr/webapp/web/ui/js/angular/app.js
diff --git a/solr/webapp/web/js/angular/controllers/analysis.js b/solr/webapp/web/ui/js/angular/controllers/analysis.js
similarity index 100%
rename from solr/webapp/web/js/angular/controllers/analysis.js
rename to solr/webapp/web/ui/js/angular/controllers/analysis.js
diff --git a/solr/webapp/web/js/angular/controllers/cloud.js b/solr/webapp/web/ui/js/angular/controllers/cloud.js
similarity index 99%
rename from solr/webapp/web/js/angular/controllers/cloud.js
rename to solr/webapp/web/ui/js/angular/controllers/cloud.js
index 2d0dae0..71595ea 100644
--- a/solr/webapp/web/js/angular/controllers/cloud.js
+++ b/solr/webapp/web/ui/js/angular/controllers/cloud.js
@@ -475,7 +475,7 @@ var init_debug = function( cloud_element )
     );
 
             url : app.config.solr_path + '/zookeeper?wt=json&dump=true',
-              ZeroClipboard.setMoviePath( 'img/ZeroClipboard.swf' );
+              ZeroClipboard.setMoviePath( 'ui/img/ZeroClipboard.swf' );
 
               clipboard_client = new ZeroClipboard.Client();
 
diff --git a/solr/webapp/web/js/angular/controllers/collection-overview.js b/solr/webapp/web/ui/js/angular/controllers/collection-overview.js
similarity index 100%
rename from solr/webapp/web/js/angular/controllers/collection-overview.js
rename to solr/webapp/web/ui/js/angular/controllers/collection-overview.js
diff --git a/solr/webapp/web/js/angular/controllers/collections.js b/solr/webapp/web/ui/js/angular/controllers/collections.js
similarity index 100%
rename from solr/webapp/web/js/angular/controllers/collections.js
rename to solr/webapp/web/ui/js/angular/controllers/collections.js
diff --git a/solr/webapp/web/js/angular/controllers/core-overview.js b/solr/webapp/web/ui/js/angular/controllers/core-overview.js
similarity index 100%
rename from solr/webapp/web/js/angular/controllers/core-overview.js
rename to solr/webapp/web/ui/js/angular/controllers/core-overview.js
diff --git a/solr/webapp/web/js/angular/controllers/cores.js b/solr/webapp/web/ui/js/angular/controllers/cores.js
similarity index 100%
rename from solr/webapp/web/js/angular/controllers/cores.js
rename to solr/webapp/web/ui/js/angular/controllers/cores.js
diff --git a/solr/webapp/web/js/angular/controllers/dataimport.js b/solr/webapp/web/ui/js/angular/controllers/dataimport.js
similarity index 100%
rename from solr/webapp/web/js/angular/controllers/dataimport.js
rename to solr/webapp/web/ui/js/angular/controllers/dataimport.js
diff --git a/solr/webapp/web/js/angular/controllers/documents.js b/solr/webapp/web/ui/js/angular/controllers/documents.js
similarity index 100%
rename from solr/webapp/web/js/angular/controllers/documents.js
rename to solr/webapp/web/ui/js/angular/controllers/documents.js
diff --git a/solr/webapp/web/js/angular/controllers/files.js b/solr/webapp/web/ui/js/angular/controllers/files.js
similarity index 100%
rename from solr/webapp/web/js/angular/controllers/files.js
rename to solr/webapp/web/ui/js/angular/controllers/files.js
diff --git a/solr/webapp/web/js/angular/controllers/index.js b/solr/webapp/web/ui/js/angular/controllers/index.js
similarity index 100%
rename from solr/webapp/web/js/angular/controllers/index.js
rename to solr/webapp/web/ui/js/angular/controllers/index.js
diff --git a/solr/webapp/web/js/angular/controllers/java-properties.js b/solr/webapp/web/ui/js/angular/controllers/java-properties.js
similarity index 100%
rename from solr/webapp/web/js/angular/controllers/java-properties.js
rename to solr/webapp/web/ui/js/angular/controllers/java-properties.js
diff --git a/solr/webapp/web/js/angular/controllers/logging.js b/solr/webapp/web/ui/js/angular/controllers/logging.js
similarity index 100%
rename from solr/webapp/web/js/angular/controllers/logging.js
rename to solr/webapp/web/ui/js/angular/controllers/logging.js
diff --git a/solr/webapp/web/js/angular/controllers/plugins.js b/solr/webapp/web/ui/js/angular/controllers/plugins.js
similarity index 100%
rename from solr/webapp/web/js/angular/controllers/plugins.js
rename to solr/webapp/web/ui/js/angular/controllers/plugins.js
diff --git a/solr/webapp/web/js/angular/controllers/query.js b/solr/webapp/web/ui/js/angular/controllers/query.js
similarity index 100%
rename from solr/webapp/web/js/angular/controllers/query.js
rename to solr/webapp/web/ui/js/angular/controllers/query.js
diff --git a/solr/webapp/web/js/angular/controllers/replication.js b/solr/webapp/web/ui/js/angular/controllers/replication.js
similarity index 100%
rename from solr/webapp/web/js/angular/controllers/replication.js
rename to solr/webapp/web/ui/js/angular/controllers/replication.js
diff --git a/solr/webapp/web/js/angular/controllers/schema.js b/solr/webapp/web/ui/js/angular/controllers/schema.js
similarity index 100%
rename from solr/webapp/web/js/angular/controllers/schema.js
rename to solr/webapp/web/ui/js/angular/controllers/schema.js
diff --git a/solr/webapp/web/js/angular/controllers/segments.js b/solr/webapp/web/ui/js/angular/controllers/segments.js
similarity index 100%
rename from solr/webapp/web/js/angular/controllers/segments.js
rename to solr/webapp/web/ui/js/angular/controllers/segments.js
diff --git a/solr/webapp/web/js/angular/controllers/stream.js b/solr/webapp/web/ui/js/angular/controllers/stream.js
similarity index 100%
rename from solr/webapp/web/js/angular/controllers/stream.js
rename to solr/webapp/web/ui/js/angular/controllers/stream.js
diff --git a/solr/webapp/web/js/angular/controllers/threads.js b/solr/webapp/web/ui/js/angular/controllers/threads.js
similarity index 100%
rename from solr/webapp/web/js/angular/controllers/threads.js
rename to solr/webapp/web/ui/js/angular/controllers/threads.js
diff --git a/solr/webapp/web/js/angular/services.js b/solr/webapp/web/ui/js/angular/services.js
similarity index 82%
rename from solr/webapp/web/js/angular/services.js
rename to solr/webapp/web/ui/js/angular/services.js
index 07043c3..77214b6 100644
--- a/solr/webapp/web/js/angular/services.js
+++ b/solr/webapp/web/ui/js/angular/services.js
@@ -19,11 +19,11 @@ var solrAdminServices = angular.module('solrAdminServices', ['ngResource']);
 
 solrAdminServices.factory('System',
   ['$resource', function($resource) {
-    return $resource('admin/info/system', {"wt":"json", "_":Date.now()});
+    return $resource('../admin/info/system', {"wt":"json", "_":Date.now()});
   }])
 .factory('Collections',
   ['$resource', function($resource) {
-    return $resource('admin/collections',
+    return $resource('../admin/collections',
     {'wt':'json', '_':Date.now()}, {
     "list": {params:{action: "LIST"}},
     "status": {params:{action: "CLUSTERSTATUS"}},
@@ -40,7 +40,7 @@ solrAdminServices.factory('System',
   }])
 .factory('Cores',
   ['$resource', function($resource) {
-    return $resource('admin/cores',
+    return $resource('../admin/cores',
     {'wt':'json', '_':Date.now()}, {
     "query": {},
     "list": {params:{indexInfo: false}},
@@ -54,7 +54,7 @@ solrAdminServices.factory('System',
   }])
 .factory('Logging',
   ['$resource', function($resource) {
-    return $resource('admin/info/logging', {'wt':'json', '_':Date.now()}, {
+    return $resource('../admin/info/logging', {'wt':'json', '_':Date.now()}, {
       "events": {params: {since:'0'}},
       "levels": {},
       "setLevel": {}
@@ -62,7 +62,7 @@ solrAdminServices.factory('System',
   }])
 .factory('Zookeeper',
   ['$resource', function($resource) {
-    return $resource('admin/zookeeper', {wt:'json', _:Date.now()}, {
+    return $resource('../admin/zookeeper', {wt:'json', _:Date.now()}, {
       "simple": {},
       "dump": {params: {dump: "true"}},
       "liveNodes": {params: {path: '/live_nodes'}},
@@ -81,30 +81,30 @@ solrAdminServices.factory('System',
   }])
 .factory('Properties',
   ['$resource', function($resource) {
-    return $resource('admin/info/properties', {'wt':'json', '_':Date.now()});
+    return $resource('../admin/info/properties', {'wt':'json', '_':Date.now()});
   }])
 .factory('Threads',
   ['$resource', function($resource) {
-    return $resource('admin/info/threads', {'wt':'json', '_':Date.now()});
+    return $resource('../admin/info/threads', {'wt':'json', '_':Date.now()});
   }])
 .factory('Properties',
   ['$resource', function($resource) {
-    return $resource('admin/info/properties', {'wt':'json', '_':Date.now()});
+    return $resource('../admin/info/properties', {'wt':'json', '_':Date.now()});
   }])
 .factory('Replication',
   ['$resource', function($resource) {
-    return $resource(':core/replication', {'wt':'json', core: "@core", '_':Date.now()}, {
+    return $resource('../:core/replication', {'wt':'json', core: "@core", '_':Date.now()}, {
       "details": {params: {command: "details"}},
       "command": {params: {}}
     });
   }])
 .factory('CoreSystem',
   ['$resource', function($resource) {
-    return $resource(':core/admin/system', {wt:'json', core: "@core", _:Date.now()});
+    return $resource('../:core/admin/system', {wt:'json', core: "@core", _:Date.now()});
   }])
 .factory('Update',
   ['$resource', function($resource) {
-    return $resource(':core/:handler', {core: '@core', wt:'json', _:Date.now(), handler:'update'}, {
+    return $resource('../:core/:handler', {core: '@core', wt:'json', _:Date.now(), handler:'update'}, {
       "optimize": {params: { optimize: "true"}},
       "commit": {params: {commit: "true"}},
       "post": {headers: {'Content-type': 'application/json'}, method: "POST", params: {handler: '@handler'}},
@@ -135,7 +135,7 @@ solrAdminServices.factory('System',
 })
 .factory('Luke',
   ['$resource', function($resource) {
-    return $resource(':core/admin/luke', {core: '@core', wt:'json', _:Date.now()}, {
+    return $resource('../:core/admin/luke', {core: '@core', wt:'json', _:Date.now()}, {
       "index":  {params: {numTerms: 0, show: 'index'}},
       "raw": {params: {numTerms: 0}},
       "schema": {params: {show:'schema'}},
@@ -156,13 +156,13 @@ solrAdminServices.factory('System',
   }])
 .factory('Analysis',
   ['$resource', function($resource) {
-    return $resource(':core/analysis/field', {core: '@core', wt:'json', _:Date.now()}, {
+    return $resource('../:core/analysis/field', {core: '@core', wt:'json', _:Date.now()}, {
       "field": {params: {"analysis.showmatch": true}}
     });
   }])
 .factory('DataImport',
   ['$resource', function($resource) {
-    return $resource(':core/:name', {core: '@core', name: '@name', indent:'on', wt:'json', _:Date.now()}, {
+    return $resource('../:core/:name', {core: '@core', name: '@name', indent:'on', wt:'json', _:Date.now()}, {
       "config": {params: {command: "show-config"}, headers: {doNotIntercept: "true"},
                  transformResponse: function(data) {
                     return {config: data};
@@ -177,14 +177,14 @@ solrAdminServices.factory('System',
   }])
 .factory('Ping',
   ['$resource', function($resource) {
-    return $resource(':core/admin/ping', {wt:'json', core: '@core', ts:Date.now(), _:Date.now()}, {
+    return $resource('../:core/admin/ping', {wt:'json', core: '@core', ts:Date.now(), _:Date.now()}, {
      "ping": {},
      "status": {params:{action:"status"}, headers: {doNotIntercept: "true"}
     }});
   }])
 .factory('Mbeans',
   ['$resource', function($resource) {
-    return $resource(':core/admin/mbeans', {'wt':'json', core: '@core', '_':Date.now()}, {
+    return $resource('../:core/admin/mbeans', {'wt':'json', core: '@core', '_':Date.now()}, {
         stats: {params: {stats: true}},
         info: {},
         reference: {
@@ -203,7 +203,7 @@ solrAdminServices.factory('System',
   }])
 .factory('Files',
   ['$resource', function($resource) {
-    return $resource(':core/admin/file', {'wt':'json', core: '@core', '_':Date.now()}, {
+    return $resource('../:core/admin/file', {'wt':'json', core: '@core', '_':Date.now()}, {
       "list": {},
       "get": {method: "GET", interceptor: {
           response: function(config) {return config;}
@@ -214,7 +214,7 @@ solrAdminServices.factory('System',
   }])
 .factory('Query',
     ['$resource', function($resource) {
-       var resource = $resource(':core/:handler', {core: '@core', handler: '@handler', '_':Date.now()}, {
+       var resource = $resource('../:core/:handler', {core: '@core', handler: '@handler', '_':Date.now()}, {
            "query": {
              method: "GET",
              transformResponse: function (data) {
@@ -238,13 +238,13 @@ solrAdminServices.factory('System',
 }])
 .factory('Segments',
    ['$resource', function($resource) {
-       return $resource(':core/admin/segments', {'wt':'json', core: '@core', _:Date.now()}, {
+       return $resource('../:core/admin/segments', {'wt':'json', core: '@core', _:Date.now()}, {
            get: {}
        });
 }])
 .factory('Schema',
    ['$resource', function($resource) {
-     return $resource(':core/schema', {wt: 'json', core: '@core', _:Date.now()}, {
+     return $resource('../:core/schema', {wt: 'json', core: '@core', _:Date.now()}, {
        get: {method: "GET"},
        check: {method: "GET", headers: {doNotIntercept: "true"}},
        post: {method: "POST"}
@@ -252,7 +252,7 @@ solrAdminServices.factory('System',
 }])
 .factory('Config',
    ['$resource', function($resource) {
-     return $resource(':core/config', {wt: 'json', core: '@core', _:Date.now()}, {
+     return $resource('../:core/config', {wt: 'json', core: '@core', _:Date.now()}, {
        get: {method: "GET"}
      })
 }]);
diff --git a/solr/webapp/web/js/lib/ZeroClipboard.js b/solr/webapp/web/ui/js/lib/ZeroClipboard.js
similarity index 100%
rename from solr/webapp/web/js/lib/ZeroClipboard.js
rename to solr/webapp/web/ui/js/lib/ZeroClipboard.js
diff --git a/solr/webapp/web/js/lib/chosen.js b/solr/webapp/web/ui/js/lib/chosen.js
similarity index 100%
rename from solr/webapp/web/js/lib/chosen.js
rename to solr/webapp/web/ui/js/lib/chosen.js
diff --git a/solr/webapp/web/js/lib/console.js b/solr/webapp/web/ui/js/lib/console.js
similarity index 100%
rename from solr/webapp/web/js/lib/console.js
rename to solr/webapp/web/ui/js/lib/console.js
diff --git a/solr/webapp/web/libs/d3.js b/solr/webapp/web/ui/js/lib/d3.js
similarity index 100%
rename from solr/webapp/web/libs/d3.js
rename to solr/webapp/web/ui/js/lib/d3.js
diff --git a/solr/webapp/web/libs/highlight.js b/solr/webapp/web/ui/js/lib/highlight.js
similarity index 100%
rename from solr/webapp/web/libs/highlight.js
rename to solr/webapp/web/ui/js/lib/highlight.js
diff --git a/solr/webapp/web/js/lib/jquery-1.7.2.min.js b/solr/webapp/web/ui/js/lib/jquery-1.7.2.min.js
similarity index 100%
rename from solr/webapp/web/js/lib/jquery-1.7.2.min.js
rename to solr/webapp/web/ui/js/lib/jquery-1.7.2.min.js
diff --git a/solr/webapp/web/js/lib/jquery.ajaxfileupload.js b/solr/webapp/web/ui/js/lib/jquery.ajaxfileupload.js
similarity index 100%
rename from solr/webapp/web/js/lib/jquery.ajaxfileupload.js
rename to solr/webapp/web/ui/js/lib/jquery.ajaxfileupload.js
diff --git a/solr/webapp/web/js/lib/jquery.blockUI.js b/solr/webapp/web/ui/js/lib/jquery.blockUI.js
similarity index 100%
rename from solr/webapp/web/js/lib/jquery.blockUI.js
rename to solr/webapp/web/ui/js/lib/jquery.blockUI.js
diff --git a/solr/webapp/web/js/lib/jquery.cookie.js b/solr/webapp/web/ui/js/lib/jquery.cookie.js
similarity index 100%
rename from solr/webapp/web/js/lib/jquery.cookie.js
rename to solr/webapp/web/ui/js/lib/jquery.cookie.js
diff --git a/solr/webapp/web/js/lib/jquery.form.js b/solr/webapp/web/ui/js/lib/jquery.form.js
similarity index 100%
rename from solr/webapp/web/js/lib/jquery.form.js
rename to solr/webapp/web/ui/js/lib/jquery.form.js
diff --git a/solr/webapp/web/libs/jquery.jstree.js b/solr/webapp/web/ui/js/lib/jquery.jstree.js
similarity index 100%
rename from solr/webapp/web/libs/jquery.jstree.js
rename to solr/webapp/web/ui/js/lib/jquery.jstree.js
diff --git a/solr/webapp/web/js/lib/jquery.sammy.js b/solr/webapp/web/ui/js/lib/jquery.sammy.js
similarity index 100%
rename from solr/webapp/web/js/lib/jquery.sammy.js
rename to solr/webapp/web/ui/js/lib/jquery.sammy.js
diff --git a/solr/webapp/web/js/lib/jquery.timeago.js b/solr/webapp/web/ui/js/lib/jquery.timeago.js
similarity index 100%
rename from solr/webapp/web/js/lib/jquery.timeago.js
rename to solr/webapp/web/ui/js/lib/jquery.timeago.js
diff --git a/solr/webapp/web/js/lib/linker.js b/solr/webapp/web/ui/js/lib/linker.js
similarity index 100%
rename from solr/webapp/web/js/lib/linker.js
rename to solr/webapp/web/ui/js/lib/linker.js
diff --git a/solr/webapp/web/js/lib/naturalSort.js b/solr/webapp/web/ui/js/lib/naturalSort.js
similarity index 100%
rename from solr/webapp/web/js/lib/naturalSort.js
rename to solr/webapp/web/ui/js/lib/naturalSort.js
diff --git a/solr/webapp/web/js/lib/order.js b/solr/webapp/web/ui/js/lib/order.js
similarity index 100%
rename from solr/webapp/web/js/lib/order.js
rename to solr/webapp/web/ui/js/lib/order.js
diff --git a/solr/webapp/web/js/main.js b/solr/webapp/web/ui/js/main.js
similarity index 100%
rename from solr/webapp/web/js/main.js
rename to solr/webapp/web/ui/js/main.js
diff --git a/solr/webapp/web/js/require.js b/solr/webapp/web/ui/js/require.js
similarity index 100%
rename from solr/webapp/web/js/require.js
rename to solr/webapp/web/ui/js/require.js
diff --git a/solr/webapp/web/js/scripts/analysis.js b/solr/webapp/web/ui/js/scripts/analysis.js
similarity index 100%
rename from solr/webapp/web/js/scripts/analysis.js
rename to solr/webapp/web/ui/js/scripts/analysis.js
diff --git a/solr/webapp/web/js/scripts/app.js b/solr/webapp/web/ui/js/scripts/app.js
similarity index 100%
rename from solr/webapp/web/js/scripts/app.js
rename to solr/webapp/web/ui/js/scripts/app.js
diff --git a/solr/webapp/web/js/scripts/cloud.js b/solr/webapp/web/ui/js/scripts/cloud.js
similarity index 100%
rename from solr/webapp/web/js/scripts/cloud.js
rename to solr/webapp/web/ui/js/scripts/cloud.js
diff --git a/solr/webapp/web/js/scripts/cores.js b/solr/webapp/web/ui/js/scripts/cores.js
similarity index 100%
rename from solr/webapp/web/js/scripts/cores.js
rename to solr/webapp/web/ui/js/scripts/cores.js
diff --git a/solr/webapp/web/js/scripts/dashboard.js b/solr/webapp/web/ui/js/scripts/dashboard.js
similarity index 100%
rename from solr/webapp/web/js/scripts/dashboard.js
rename to solr/webapp/web/ui/js/scripts/dashboard.js
diff --git a/solr/webapp/web/js/scripts/dataimport.js b/solr/webapp/web/ui/js/scripts/dataimport.js
similarity index 100%
rename from solr/webapp/web/js/scripts/dataimport.js
rename to solr/webapp/web/ui/js/scripts/dataimport.js
diff --git a/solr/webapp/web/js/scripts/documents.js b/solr/webapp/web/ui/js/scripts/documents.js
similarity index 100%
rename from solr/webapp/web/js/scripts/documents.js
rename to solr/webapp/web/ui/js/scripts/documents.js
diff --git a/solr/webapp/web/js/scripts/files.js b/solr/webapp/web/ui/js/scripts/files.js
similarity index 100%
rename from solr/webapp/web/js/scripts/files.js
rename to solr/webapp/web/ui/js/scripts/files.js
diff --git a/solr/webapp/web/js/scripts/index.js b/solr/webapp/web/ui/js/scripts/index.js
similarity index 100%
rename from solr/webapp/web/js/scripts/index.js
rename to solr/webapp/web/ui/js/scripts/index.js
diff --git a/solr/webapp/web/js/scripts/java-properties.js b/solr/webapp/web/ui/js/scripts/java-properties.js
similarity index 100%
rename from solr/webapp/web/js/scripts/java-properties.js
rename to solr/webapp/web/ui/js/scripts/java-properties.js
diff --git a/solr/webapp/web/js/scripts/logging.js b/solr/webapp/web/ui/js/scripts/logging.js
similarity index 100%
rename from solr/webapp/web/js/scripts/logging.js
rename to solr/webapp/web/ui/js/scripts/logging.js
diff --git a/solr/webapp/web/js/scripts/ping.js b/solr/webapp/web/ui/js/scripts/ping.js
similarity index 100%
rename from solr/webapp/web/js/scripts/ping.js
rename to solr/webapp/web/ui/js/scripts/ping.js
diff --git a/solr/webapp/web/js/scripts/plugins.js b/solr/webapp/web/ui/js/scripts/plugins.js
similarity index 100%
rename from solr/webapp/web/js/scripts/plugins.js
rename to solr/webapp/web/ui/js/scripts/plugins.js
diff --git a/solr/webapp/web/js/scripts/query.js b/solr/webapp/web/ui/js/scripts/query.js
similarity index 100%
rename from solr/webapp/web/js/scripts/query.js
rename to solr/webapp/web/ui/js/scripts/query.js
diff --git a/solr/webapp/web/js/scripts/replication.js b/solr/webapp/web/ui/js/scripts/replication.js
similarity index 100%
rename from solr/webapp/web/js/scripts/replication.js
rename to solr/webapp/web/ui/js/scripts/replication.js
diff --git a/solr/webapp/web/js/scripts/schema-browser.js b/solr/webapp/web/ui/js/scripts/schema-browser.js
similarity index 100%
rename from solr/webapp/web/js/scripts/schema-browser.js
rename to solr/webapp/web/ui/js/scripts/schema-browser.js
diff --git a/solr/webapp/web/js/scripts/segments.js b/solr/webapp/web/ui/js/scripts/segments.js
similarity index 100%
rename from solr/webapp/web/js/scripts/segments.js
rename to solr/webapp/web/ui/js/scripts/segments.js
diff --git a/solr/webapp/web/js/scripts/threads.js b/solr/webapp/web/ui/js/scripts/threads.js
similarity index 100%
rename from solr/webapp/web/js/scripts/threads.js
rename to solr/webapp/web/ui/js/scripts/threads.js
diff --git a/solr/webapp/web/libs/angular-chosen.js b/solr/webapp/web/ui/libs/angular-chosen.js
similarity index 100%
rename from solr/webapp/web/libs/angular-chosen.js
rename to solr/webapp/web/ui/libs/angular-chosen.js
diff --git a/solr/webapp/web/libs/angular-cookies.js b/solr/webapp/web/ui/libs/angular-cookies.js
similarity index 100%
rename from solr/webapp/web/libs/angular-cookies.js
rename to solr/webapp/web/ui/libs/angular-cookies.js
diff --git a/solr/webapp/web/libs/angular-cookies.min.js b/solr/webapp/web/ui/libs/angular-cookies.min.js
similarity index 100%
rename from solr/webapp/web/libs/angular-cookies.min.js
rename to solr/webapp/web/ui/libs/angular-cookies.min.js
diff --git a/solr/webapp/web/libs/angular-resource.min.js b/solr/webapp/web/ui/libs/angular-resource.min.js
similarity index 100%
rename from solr/webapp/web/libs/angular-resource.min.js
rename to solr/webapp/web/ui/libs/angular-resource.min.js
diff --git a/solr/webapp/web/libs/angular-route.js b/solr/webapp/web/ui/libs/angular-route.js
similarity index 100%
rename from solr/webapp/web/libs/angular-route.js
rename to solr/webapp/web/ui/libs/angular-route.js
diff --git a/solr/webapp/web/libs/angular-route.min.js b/solr/webapp/web/ui/libs/angular-route.min.js
similarity index 100%
rename from solr/webapp/web/libs/angular-route.min.js
rename to solr/webapp/web/ui/libs/angular-route.min.js
diff --git a/solr/webapp/web/libs/angular-sanitize.js b/solr/webapp/web/ui/libs/angular-sanitize.js
similarity index 100%
rename from solr/webapp/web/libs/angular-sanitize.js
rename to solr/webapp/web/ui/libs/angular-sanitize.js
diff --git a/solr/webapp/web/libs/angular-sanitize.min.js b/solr/webapp/web/ui/libs/angular-sanitize.min.js
similarity index 100%
rename from solr/webapp/web/libs/angular-sanitize.min.js
rename to solr/webapp/web/ui/libs/angular-sanitize.min.js
diff --git a/solr/webapp/web/libs/angular.js b/solr/webapp/web/ui/libs/angular.js
similarity index 100%
rename from solr/webapp/web/libs/angular.js
rename to solr/webapp/web/ui/libs/angular.js
diff --git a/solr/webapp/web/libs/angular.min.js b/solr/webapp/web/ui/libs/angular.min.js
similarity index 100%
rename from solr/webapp/web/libs/angular.min.js
rename to solr/webapp/web/ui/libs/angular.min.js
diff --git a/solr/webapp/web/libs/chosen.jquery.js b/solr/webapp/web/ui/libs/chosen.jquery.js
similarity index 100%
rename from solr/webapp/web/libs/chosen.jquery.js
rename to solr/webapp/web/ui/libs/chosen.jquery.js
diff --git a/solr/webapp/web/libs/chosen.jquery.min.js b/solr/webapp/web/ui/libs/chosen.jquery.min.js
similarity index 100%
rename from solr/webapp/web/libs/chosen.jquery.min.js
rename to solr/webapp/web/ui/libs/chosen.jquery.min.js
diff --git a/solr/webapp/web/js/lib/d3.js b/solr/webapp/web/ui/libs/d3.js
similarity index 100%
rename from solr/webapp/web/js/lib/d3.js
rename to solr/webapp/web/ui/libs/d3.js
diff --git a/solr/webapp/web/js/lib/highlight.js b/solr/webapp/web/ui/libs/highlight.js
similarity index 100%
rename from solr/webapp/web/js/lib/highlight.js
rename to solr/webapp/web/ui/libs/highlight.js
diff --git a/solr/webapp/web/libs/jquery-2.1.3.min.js b/solr/webapp/web/ui/libs/jquery-2.1.3.min.js
similarity index 100%
rename from solr/webapp/web/libs/jquery-2.1.3.min.js
rename to solr/webapp/web/ui/libs/jquery-2.1.3.min.js
diff --git a/solr/webapp/web/js/lib/jquery.jstree.js b/solr/webapp/web/ui/libs/jquery.jstree.js
similarity index 100%
rename from solr/webapp/web/js/lib/jquery.jstree.js
rename to solr/webapp/web/ui/libs/jquery.jstree.js
diff --git a/solr/webapp/web/libs/ngtimeago.js b/solr/webapp/web/ui/libs/ngtimeago.js
similarity index 100%
rename from solr/webapp/web/libs/ngtimeago.js
rename to solr/webapp/web/ui/libs/ngtimeago.js
diff --git a/solr/webapp/web/old.html b/solr/webapp/web/ui/old.html
similarity index 100%
rename from solr/webapp/web/old.html
rename to solr/webapp/web/ui/old.html
diff --git a/solr/webapp/web/partials/analysis.html b/solr/webapp/web/ui/partials/analysis.html
similarity index 100%
rename from solr/webapp/web/partials/analysis.html
rename to solr/webapp/web/ui/partials/analysis.html
diff --git a/solr/webapp/web/partials/cloud.html b/solr/webapp/web/ui/partials/cloud.html
similarity index 100%
rename from solr/webapp/web/partials/cloud.html
rename to solr/webapp/web/ui/partials/cloud.html
diff --git a/solr/webapp/web/partials/collection_overview.html b/solr/webapp/web/ui/partials/collection_overview.html
similarity index 100%
rename from solr/webapp/web/partials/collection_overview.html
rename to solr/webapp/web/ui/partials/collection_overview.html
diff --git a/solr/webapp/web/partials/collections.html b/solr/webapp/web/ui/partials/collections.html
similarity index 100%
rename from solr/webapp/web/partials/collections.html
rename to solr/webapp/web/ui/partials/collections.html
diff --git a/solr/webapp/web/partials/core_overview.html b/solr/webapp/web/ui/partials/core_overview.html
similarity index 100%
rename from solr/webapp/web/partials/core_overview.html
rename to solr/webapp/web/ui/partials/core_overview.html
diff --git a/solr/webapp/web/partials/cores.html b/solr/webapp/web/ui/partials/cores.html
similarity index 100%
rename from solr/webapp/web/partials/cores.html
rename to solr/webapp/web/ui/partials/cores.html
diff --git a/solr/webapp/web/partials/dataimport.html b/solr/webapp/web/ui/partials/dataimport.html
similarity index 100%
rename from solr/webapp/web/partials/dataimport.html
rename to solr/webapp/web/ui/partials/dataimport.html
diff --git a/solr/webapp/web/partials/documents.html b/solr/webapp/web/ui/partials/documents.html
similarity index 100%
rename from solr/webapp/web/partials/documents.html
rename to solr/webapp/web/ui/partials/documents.html
diff --git a/solr/webapp/web/partials/files.html b/solr/webapp/web/ui/partials/files.html
similarity index 100%
rename from solr/webapp/web/partials/files.html
rename to solr/webapp/web/ui/partials/files.html
diff --git a/solr/webapp/web/partials/index.html b/solr/webapp/web/ui/partials/index.html
similarity index 100%
rename from solr/webapp/web/partials/index.html
rename to solr/webapp/web/ui/partials/index.html
diff --git a/solr/webapp/web/partials/java-properties.html b/solr/webapp/web/ui/partials/java-properties.html
similarity index 100%
rename from solr/webapp/web/partials/java-properties.html
rename to solr/webapp/web/ui/partials/java-properties.html
diff --git a/solr/webapp/web/partials/logging-levels.html b/solr/webapp/web/ui/partials/logging-levels.html
similarity index 100%
rename from solr/webapp/web/partials/logging-levels.html
rename to solr/webapp/web/ui/partials/logging-levels.html
diff --git a/solr/webapp/web/partials/logging.html b/solr/webapp/web/ui/partials/logging.html
similarity index 100%
rename from solr/webapp/web/partials/logging.html
rename to solr/webapp/web/ui/partials/logging.html
diff --git a/solr/webapp/web/partials/plugins.html b/solr/webapp/web/ui/partials/plugins.html
similarity index 100%
rename from solr/webapp/web/partials/plugins.html
rename to solr/webapp/web/ui/partials/plugins.html
diff --git a/solr/webapp/web/partials/query.html b/solr/webapp/web/ui/partials/query.html
similarity index 100%
rename from solr/webapp/web/partials/query.html
rename to solr/webapp/web/ui/partials/query.html
diff --git a/solr/webapp/web/partials/replication.html b/solr/webapp/web/ui/partials/replication.html
similarity index 100%
rename from solr/webapp/web/partials/replication.html
rename to solr/webapp/web/ui/partials/replication.html
diff --git a/solr/webapp/web/partials/schema.html b/solr/webapp/web/ui/partials/schema.html
similarity index 100%
rename from solr/webapp/web/partials/schema.html
rename to solr/webapp/web/ui/partials/schema.html
diff --git a/solr/webapp/web/partials/segments.html b/solr/webapp/web/ui/partials/segments.html
similarity index 100%
rename from solr/webapp/web/partials/segments.html
rename to solr/webapp/web/ui/partials/segments.html
diff --git a/solr/webapp/web/partials/stream.html b/solr/webapp/web/ui/partials/stream.html
similarity index 100%
rename from solr/webapp/web/partials/stream.html
rename to solr/webapp/web/ui/partials/stream.html
diff --git a/solr/webapp/web/partials/threads.html b/solr/webapp/web/ui/partials/threads.html
similarity index 100%
rename from solr/webapp/web/partials/threads.html
rename to solr/webapp/web/ui/partials/threads.html
diff --git a/solr/webapp/web/tpl/analysis.html b/solr/webapp/web/ui/tpl/analysis.html
similarity index 100%
rename from solr/webapp/web/tpl/analysis.html
rename to solr/webapp/web/ui/tpl/analysis.html
diff --git a/solr/webapp/web/tpl/cloud.html b/solr/webapp/web/ui/tpl/cloud.html
similarity index 100%
rename from solr/webapp/web/tpl/cloud.html
rename to solr/webapp/web/ui/tpl/cloud.html
diff --git a/solr/webapp/web/tpl/cores.html b/solr/webapp/web/ui/tpl/cores.html
similarity index 100%
rename from solr/webapp/web/tpl/cores.html
rename to solr/webapp/web/ui/tpl/cores.html
diff --git a/solr/webapp/web/tpl/dashboard.html b/solr/webapp/web/ui/tpl/dashboard.html
similarity index 100%
rename from solr/webapp/web/tpl/dashboard.html
rename to solr/webapp/web/ui/tpl/dashboard.html
diff --git a/solr/webapp/web/tpl/dataimport.html b/solr/webapp/web/ui/tpl/dataimport.html
similarity index 100%
rename from solr/webapp/web/tpl/dataimport.html
rename to solr/webapp/web/ui/tpl/dataimport.html
diff --git a/solr/webapp/web/tpl/documents.html b/solr/webapp/web/ui/tpl/documents.html
similarity index 100%
rename from solr/webapp/web/tpl/documents.html
rename to solr/webapp/web/ui/tpl/documents.html
diff --git a/solr/webapp/web/tpl/files.html b/solr/webapp/web/ui/tpl/files.html
similarity index 100%
rename from solr/webapp/web/tpl/files.html
rename to solr/webapp/web/ui/tpl/files.html
diff --git a/solr/webapp/web/tpl/index.html b/solr/webapp/web/ui/tpl/index.html
similarity index 100%
rename from solr/webapp/web/tpl/index.html
rename to solr/webapp/web/ui/tpl/index.html
diff --git a/solr/webapp/web/tpl/logging.html b/solr/webapp/web/ui/tpl/logging.html
similarity index 100%
rename from solr/webapp/web/tpl/logging.html
rename to solr/webapp/web/ui/tpl/logging.html
diff --git a/solr/webapp/web/tpl/plugins.html b/solr/webapp/web/ui/tpl/plugins.html
similarity index 100%
rename from solr/webapp/web/tpl/plugins.html
rename to solr/webapp/web/ui/tpl/plugins.html
diff --git a/solr/webapp/web/tpl/query.html b/solr/webapp/web/ui/tpl/query.html
similarity index 100%
rename from solr/webapp/web/tpl/query.html
rename to solr/webapp/web/ui/tpl/query.html
diff --git a/solr/webapp/web/tpl/replication.html b/solr/webapp/web/ui/tpl/replication.html
similarity index 100%
rename from solr/webapp/web/tpl/replication.html
rename to solr/webapp/web/ui/tpl/replication.html
diff --git a/solr/webapp/web/tpl/schema-browser.html b/solr/webapp/web/ui/tpl/schema-browser.html
similarity index 100%
rename from solr/webapp/web/tpl/schema-browser.html
rename to solr/webapp/web/ui/tpl/schema-browser.html
diff --git a/solr/webapp/web/tpl/segments.html b/solr/webapp/web/ui/tpl/segments.html
similarity index 100%
rename from solr/webapp/web/tpl/segments.html
rename to solr/webapp/web/ui/tpl/segments.html
diff --git a/solr/webapp/web/tpl/threads.html b/solr/webapp/web/ui/tpl/threads.html
similarity index 100%
rename from solr/webapp/web/tpl/threads.html
rename to solr/webapp/web/ui/tpl/threads.html
