GUI -- reworking code to eliminate unnecessary 'ONOS' global.
 - re-package fn and keys factories into util module.

Change-Id: I3d9f50b9a91468140845e862aff3fdb518948774
diff --git a/web/gui/src/main/webapp/app/index.html b/web/gui/src/main/webapp/app/index.html
index 6084854..14a029f 100644
--- a/web/gui/src/main/webapp/app/index.html
+++ b/web/gui/src/main/webapp/app/index.html
@@ -32,8 +32,11 @@
     <!-- ONOS UI Framework included here -->
     <!-- TODO: use a single catenated-minified file here -->
     <script src="onos.js"></script>
-    <script src="fw/lib/fn.js"></script>
-    <script src="fw/lib/keys.js"></script>
+
+    <script src="fw/util/util.js"></script>
+    <script src="fw/util/fn.js"></script>
+    <script src="fw/util/keys.js"></script>
+
     <script src="fw/mast/mast.js"></script>
 
     <!-- Framework and library stylesheets included here -->