diff --git a/web/gui/src/main/webapp/OLD/index.html b/web/gui/src/main/webapp/OLD/index.html
index 7fecd38..e37df9a 100644
--- a/web/gui/src/main/webapp/OLD/index.html
+++ b/web/gui/src/main/webapp/OLD/index.html
@@ -26,8 +26,8 @@
     <title>ONOS GUI</title>
 
     <!--TODO: use the minified version of d3, once debugging is complete -->
-    <script src="../libs/d3.js"></script>
-    <script src="../libs/jquery-2.1.1.min.js"></script>
+    <script src="../tp/d3.js"></script>
+    <script src="../tp/jquery-2.1.1.min.js"></script>
 
     <link rel="stylesheet" href="../base.css">
     <link rel="stylesheet" href="onos.css">
diff --git a/web/gui/src/main/webapp/WEB-INF/web.xml b/web/gui/src/main/webapp/WEB-INF/web.xml
index 32f1ddd..1afdef7 100644
--- a/web/gui/src/main/webapp/WEB-INF/web.xml
+++ b/web/gui/src/main/webapp/WEB-INF/web.xml
@@ -14,14 +14,14 @@
   ~ See the License for the specific language governing permissions and
   ~ limitations under the License.
   -->
-<web-app xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://java.sun.com/xml/ns/javaee"
-         xmlns:web="http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd"
+<web-app xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xmlns="http://java.sun.com/xml/ns/javaee"
          xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd"
          id="ONOS" version="2.5">
     <display-name>ONOS GUI</display-name>
 
     <welcome-file-list>
-        <welcome-file>index2.html</welcome-file>
+        <welcome-file>index.html</welcome-file>
     </welcome-file-list>
 
     <servlet>
diff --git a/web/gui/src/main/webapp/_sdh/icons.html b/web/gui/src/main/webapp/_sdh/icons.html
index 50807de..0422854 100644
--- a/web/gui/src/main/webapp/_sdh/icons.html
+++ b/web/gui/src/main/webapp/_sdh/icons.html
@@ -4,9 +4,9 @@
     <meta charset="utf-8">
     <title>Icons</title>
 
-    <script src="../libs/d3.js"></script>
-    <script src="../libs/topojson.v1.min.js"></script>
-    <script src="../libs/jquery-2.1.1.min.js"></script>
+    <script src="../tp/d3.js"></script>
+    <script src="../tp/topojson.v1.min.js"></script>
+    <script src="../tp/jquery-2.1.1.min.js"></script>
 
     <style>
         html,
diff --git a/web/gui/src/main/webapp/geometry2.js b/web/gui/src/main/webapp/geometry.js
similarity index 100%
rename from web/gui/src/main/webapp/geometry2.js
rename to web/gui/src/main/webapp/geometry.js
diff --git a/web/gui/src/main/webapp/index2.html b/web/gui/src/main/webapp/index.html
similarity index 83%
rename from web/gui/src/main/webapp/index2.html
rename to web/gui/src/main/webapp/index.html
index c5d1c98..8991319 100644
--- a/web/gui/src/main/webapp/index2.html
+++ b/web/gui/src/main/webapp/index.html
@@ -30,28 +30,28 @@
 
     <!-- Third party library code included here -->
     <!--TODO: use the minified version of d3, once debugging is complete -->
-    <script src="libs/d3.js"></script>
-    <script src="libs/topojson.v1.min.js"></script>
-    <script src="libs/jquery-2.1.1.min.js"></script>
+    <script src="tp/d3.js"></script>
+    <script src="tp/topojson.v1.min.js"></script>
+    <script src="tp/jquery-2.1.1.min.js"></script>
 
     <!-- Base library and framework stylesheets included here -->
     <link rel="stylesheet" href="base.css">
-    <link rel="stylesheet" href="onos2.css">
-    <link rel="stylesheet" href="mast2.css">
-    <link rel="stylesheet" href="floatPanel.css">
-    <link rel="stylesheet" href="feedback.css">
+    <link rel="stylesheet" href="onos.css">
+    <link rel="stylesheet" href="onosMast.css">
+    <link rel="stylesheet" href="onosFloatPanel.css">
+    <link rel="stylesheet" href="onosFlash.css">
     <link rel="stylesheet" href="onosQuickHelp.css">
 
     <!-- This is where contributed stylesheets get INJECTED -->
     <!-- TODO: replace with template marker and inject refs server-side -->
-    <link rel="stylesheet" href="topo2.css">
+    <link rel="stylesheet" href="topo.css">
 
 
     <!-- General library modules included here-->
-    <script src="geometry2.js"></script>
+    <script src="geometry.js"></script>
 
     <!-- ONOS UI Framework included here-->
-    <script src="onos2.js"></script>
+    <script src="onos.js"></script>
 
 </head>
 <body>
@@ -91,8 +91,8 @@
     <script src="glyphs.js"></script>
 
     <!-- Framework module files included here -->
-    <script src="mast2.js"></script>
-    <script src="feedback.js"></script>
+    <script src="onosMast.js"></script>
+    <script src="onosFlash.js"></script>
     <script src="onosQuickHelp.js"></script>
 
     <!-- View Module Templates; REMOVE THESE LINES, FOR PRODUCTION -->
@@ -100,14 +100,14 @@
     <script src="module-div-template.js"></script>
 
     <!-- Sample views; REMOVE THESE LINES, FOR PRODUCTION -->
-    <script src="sample2.js"></script>
+    <script src="sample.js"></script>
     <script src="sampleRadio.js"></script>
     <script src="sampleKeys.js"></script>
     <script src="sampleHash.js"></script>
 
     <!-- Contributed (application) views injected here -->
     <!-- TODO: replace with template marker and inject refs server-side -->
-    <script src="topo2.js"></script>
+    <script src="topo.js"></script>
 
     <!-- finally, build the UI-->
     <script type="text/javascript">
diff --git a/web/gui/src/main/webapp/onos2.css b/web/gui/src/main/webapp/onos.css
similarity index 100%
rename from web/gui/src/main/webapp/onos2.css
rename to web/gui/src/main/webapp/onos.css
diff --git a/web/gui/src/main/webapp/onos2.js b/web/gui/src/main/webapp/onos.js
similarity index 100%
rename from web/gui/src/main/webapp/onos2.js
rename to web/gui/src/main/webapp/onos.js
diff --git a/web/gui/src/main/webapp/feedback.css b/web/gui/src/main/webapp/onosFlash.css
similarity index 100%
rename from web/gui/src/main/webapp/feedback.css
rename to web/gui/src/main/webapp/onosFlash.css
diff --git a/web/gui/src/main/webapp/feedback.js b/web/gui/src/main/webapp/onosFlash.js
similarity index 100%
rename from web/gui/src/main/webapp/feedback.js
rename to web/gui/src/main/webapp/onosFlash.js
diff --git a/web/gui/src/main/webapp/floatPanel.css b/web/gui/src/main/webapp/onosFloatPanel.css
similarity index 100%
rename from web/gui/src/main/webapp/floatPanel.css
rename to web/gui/src/main/webapp/onosFloatPanel.css
diff --git a/web/gui/src/main/webapp/mast2.css b/web/gui/src/main/webapp/onosMast.css
similarity index 100%
rename from web/gui/src/main/webapp/mast2.css
rename to web/gui/src/main/webapp/onosMast.css
diff --git a/web/gui/src/main/webapp/mast2.js b/web/gui/src/main/webapp/onosMast.js
similarity index 100%
rename from web/gui/src/main/webapp/mast2.js
rename to web/gui/src/main/webapp/onosMast.js
diff --git a/web/gui/src/main/webapp/sample2.js b/web/gui/src/main/webapp/sample.js
similarity index 100%
rename from web/gui/src/main/webapp/sample2.js
rename to web/gui/src/main/webapp/sample.js
diff --git a/web/gui/src/main/webapp/topo2.css b/web/gui/src/main/webapp/topo.css
similarity index 100%
rename from web/gui/src/main/webapp/topo2.css
rename to web/gui/src/main/webapp/topo.css
diff --git a/web/gui/src/main/webapp/topo2.js b/web/gui/src/main/webapp/topo.js
similarity index 99%
rename from web/gui/src/main/webapp/topo2.js
rename to web/gui/src/main/webapp/topo.js
index 17baa61..eb05dbf 100644
--- a/web/gui/src/main/webapp/topo2.js
+++ b/web/gui/src/main/webapp/topo.js
@@ -1987,7 +1987,7 @@
             .replace(/\#.*/, '')
             .replace('http://', 'ws://')
             .replace('https://', 'wss://')
-            .replace('index2.html', config.webSockUrl);
+            .replace('index.html', config.webSockUrl);
     }
 
     webSock = {
diff --git a/web/gui/src/main/webapp/libs/D3.LICENSE b/web/gui/src/main/webapp/tp/D3.LICENSE
similarity index 100%
rename from web/gui/src/main/webapp/libs/D3.LICENSE
rename to web/gui/src/main/webapp/tp/D3.LICENSE
diff --git a/web/gui/src/main/webapp/libs/d3.js b/web/gui/src/main/webapp/tp/d3.js
similarity index 100%
rename from web/gui/src/main/webapp/libs/d3.js
rename to web/gui/src/main/webapp/tp/d3.js
diff --git a/web/gui/src/main/webapp/libs/d3.min.js b/web/gui/src/main/webapp/tp/d3.min.js
similarity index 100%
rename from web/gui/src/main/webapp/libs/d3.min.js
rename to web/gui/src/main/webapp/tp/d3.min.js
diff --git a/web/gui/src/main/webapp/libs/jquery-2.1.1.js b/web/gui/src/main/webapp/tp/jquery-2.1.1.js
similarity index 100%
rename from web/gui/src/main/webapp/libs/jquery-2.1.1.js
rename to web/gui/src/main/webapp/tp/jquery-2.1.1.js
diff --git a/web/gui/src/main/webapp/libs/jquery-2.1.1.min.js b/web/gui/src/main/webapp/tp/jquery-2.1.1.min.js
similarity index 100%
rename from web/gui/src/main/webapp/libs/jquery-2.1.1.min.js
rename to web/gui/src/main/webapp/tp/jquery-2.1.1.min.js
diff --git a/web/gui/src/main/webapp/libs/topojson.v1.min.js b/web/gui/src/main/webapp/tp/topojson.v1.min.js
similarity index 100%
rename from web/gui/src/main/webapp/libs/topojson.v1.min.js
rename to web/gui/src/main/webapp/tp/topojson.v1.min.js