Index: trunk/webapps/cptms.html
===================================================================
--- trunk/webapps/cptms.html	(revision 320)
+++ trunk/webapps/cptms.html	(revision 325)
@@ -172,8 +172,8 @@
     </div>
     <!--The div elements where the buttons appear  -->
-    <div id="ctrButton"><img width="30" src="images/CPTMSImages/btn_mapcenter.png"</div>
-    <button id="cctvButton" class="unstyled-button"><img id="cctvBtnImg" src="images/CPTMSImages/btnReady_CCTV.png"></button>
-    <button id="cmsButton" class="unstyled-button"><img id="cmsBtnImg" src="images/CPTMSImages/btnReady_CMS.png"></button>
-    <button id="vdsButton" class="unstyled-button"><img id="vdsBtnImg" src="images/CPTMSImages/btnDepressed_VDS.png"></button>
+    <div id="ctrButton"><img width="30" src="images/btn_mapcenter.png"</div>
+    <button id="cctvButton" class="unstyled-button"><img id="cctvBtnImg" src="images/btnReady_CCTV.png"></button>
+    <button id="cmsButton" class="unstyled-button"><img id="cmsBtnImg" src="images/btnReady_CMS.png"></button>
+    <button id="vdsButton" class="unstyled-button"><img id="vdsBtnImg" src="images/btnDepressed_VDS.png"></button>
 
     <script>
@@ -188,8 +188,4 @@
     // a global variable to hold locations of marked search places
     var placePins = [];
-    // Constant name of dynamic json data file created by CADserver
-    var kMapPointsFile = "highways.json";
-    // Constant name of initial (static) highways file used once at startup
-    var kMapStartupFile = "highways_startup.json";
     // Constant for map center location: The John Wayne Airport
     //var centerPoint = {lat: 33.687228, lng: -117.872148};
@@ -210,13 +206,16 @@
         "red": 30
     };
-    var kCMSstartupFile = "cmsStatusD12.json";
-    var kCCTVfile = "cctv_locations_D12.json";
-    var blueFlag = "images/CPTMSImages/icon_cmsBlue.png";
-    var yellowFlag = "images/CPTMSImages/icon_cmsYellow.png";
-    var cctvIcon = "images/CPTMSImages/icon_cctvCyan.png";
-    var cctvIconWhite = "images/CPTMSImages/icon_cctvWhite.png";
-    var vdsIconGreen = "images/CPTMSImages/circle-green.png"
-    var vdsIconYellow = "images/CPTMSImages/circle-yellow.png"
-    var vdsIconRed = "images/CPTMSImages/circle-red.png"
+
+    var kMapPointsFile = "highways.json"; // dynamic json data file created by CADserver
+    var kMapStartupFile = "highways_startup.json"; // initial (static) highways file used once at startup
+    var kCMSfile = "data_layers/cms_locations_D12.gjson"; // CMS locations 
+    var kCCTVfile = "data_layers/cctv_locations_D12.gjson"; // CCTV locations
+    var blueFlag = "images/icon_cmsBlue.png";
+    var yellowFlag = "images/icon_cmsYellow.png";
+    var cctvIcon = "images/icon_cctvCyan.png";
+    var cctvIconWhite = "images/icon_cctvWhite.png";
+    var vdsIconGreen = "images/circle-green.png"
+    var vdsIconYellow = "images/circle-yellow.png"
+    var vdsIconRed = "images/circle-red.png"
     var cms_info;
     var messageDict = {};
@@ -509,9 +508,9 @@
             if (cctv_showing)
             {
-                pic = "images/CPTMSImages/btnDepressed_CCTV.png"
+                pic = "images/btnDepressed_CCTV.png"
             }
             else
             {
-                pic = "images/CPTMSImages/btnReady_CCTV.png"
+                pic = "images/btnReady_CCTV.png"
             }
             document.getElementById('cctvBtnImg').src = pic;
@@ -528,5 +527,5 @@
             if (cms_showing)
             {
-                pic = "images/CPTMSImages/btnDepressed_CMS.png"
+                pic = "images/btnDepressed_CMS.png"
                 // It's nice when icons become visible that the messages have been refreshed.
                 loadAllMessages();
@@ -534,5 +533,5 @@
             else
             {
-                pic = "images/CPTMSImages/btnReady_CMS.png"
+                pic = "images/btnReady_CMS.png"
             }
             document.getElementById('cmsBtnImg').src = pic;
@@ -566,9 +565,9 @@
             if (vds_showing)
             {
-                pic = "images/CPTMSImages/btnDepressed_VDS.png"
+                pic = "images/btnDepressed_VDS.png"
             }
             else
             {
-                pic = "images/CPTMSImages/btnReady_VDS.png"
+                pic = "images/btnReady_VDS.png"
             }
             document.getElementById('vdsBtnImg').src = pic;
@@ -580,5 +579,5 @@
     cmsLayer = new google.maps.Data();
     cmsLayer.setMap(map);
-    cmsLayer.loadGeoJson("cms_locations_D12.gjson");
+    cmsLayer.loadGeoJson(kCMSfile);  
     cmsLayer.setStyle(function(feature)
     {
@@ -628,8 +627,8 @@
 function loadCCTVlayer()
 {
-    var imgTag = '<IMG WIDTH="700" SRC="images/CPTMSImages/';
+    var imgTag = '<IMG WIDTH="700" SRC="images/';
     cctv_infowindow = new google.maps.InfoWindow();
     cctvLayer = new google.maps.Data();
-    cctvLayer.loadGeoJson("cctv_locations_D12.gjson");
+    cctvLayer.loadGeoJson(kCCTVfile);
     cctvLayer.setStyle(function(feature)
     {