diff --git a/.DS_Store b/.DS_Store
index 4724673..e125e87 100644
Binary files a/.DS_Store and b/.DS_Store differ
diff --git a/MoonPhases/LunarLibration.html b/MoonPhases/LunarLibration.html
deleted file mode 100644
index 8af7ee7..0000000
--- a/MoonPhases/LunarLibration.html
+++ /dev/null
@@ -1,71 +0,0 @@
-<!DOCTYPE html>
-<html>
-  <head>
-    <meta name="viewport" content="initial-scale=1.0, user-scalable=no" />
-    <style type="text/css">
-      html { height: 100% }
-      body { height: 100%; margin: 0; padding: 0 }
-      #map_canvas { height: 100% }
-    </style>
-    <script type="text/javascript"
-      src="http://maps.googleapis.com/maps/api/js?key=AIzaSyDHJLyabbyIQ2C8nzI2xJl4E8KqLu3oUYU&sensor=false">
-    </script>
-    <script type="text/javascript">
-      function initialize() {
-	    var myLatlng = new google.maps.LatLng(0, 0);
-	    var northLatlng = new google.maps.LatLng(85,0);
-        var myOptions = {
-          center: myLatlng,
-          zoom: 2,
-          mapTypeId: google.maps.MapTypeId.TERRAIN
-        };
-        var map = new google.maps.Map(document.getElementById("map_canvas"),
-            myOptions);
- 
-		
-	    var contentStringN = '<div id="content">'+
-			        '<div id="siteNotice">'+
-			        '</div>'+	
-			        '<h1 id="firstHeading" class="firstHeading">Lunar Libration</h1>'+
-			        '<div id="bodyContent">'+
-				    '<p> The Moon generally has one hemisphere facing the Earth, due to tidal locking. ' +
-					'Libration is manifested as a slow rocking back and forth of the Moon as viewed from Earth,'+
-					' permitting an observer to see slightly different halves of the surface at different times. '+ 
-				    '<p>Attribution: Lunar Libration, <a href="http://en.wikipedia.org/wiki/Libration">'+
-				    'http://en.wikipedia.org/wiki/Libration</a>,</p>'+
-				    '<p><a href="http://sciencenetlinks.com/interactives/moon/moon_challenge/moon_challenge.html"> Try out this moon quiz.</a></p>'+
-				    'This page was last modified on 22 April 2012 at 14:48.'+ 
-					'</div>'+
-				    '</div>';		
-				
-				
-		var moonNorth = 'images/LunarLibration.gif';
-								
-		var infowindowN = new google.maps.InfoWindow({
-			        content: contentStringN
-	    });
-	
-	
-	    var markerN = new google.maps.Marker({
-	        position: northLatlng,
-	        map: map,
-	        icon: moonNorth,
-	        title: 'Lunar Phases'
-	    });
-
-		
-	
-	    google.maps.event.addListener(markerN, 'click', function() {
-	      infowindowN.open(map,markerN);
-	    });
-	 
-	
-
-      }
-    </script>
-  </head>
-  <body onload="initialize()">
-    <div id="map_canvas" style="width:100%; height:100%"></div>
-  </body>
-</html>
-  
\ No newline at end of file
diff --git a/MoonPhases/images/LunarLibration_files/LunarLibration.gif b/MoonPhases/images/LunarLibration_files/LunarLibration.gif
deleted file mode 100644
index ba798e2..0000000
Binary files a/MoonPhases/images/LunarLibration_files/LunarLibration.gif and /dev/null differ
diff --git a/express/public/MoonPhases/LunarLibration.html b/express/public/MoonPhases/LunarLibration.html
index 6da0385..8af7ee7 100644
--- a/express/public/MoonPhases/LunarLibration.html
+++ b/express/public/MoonPhases/LunarLibration.html
@@ -22,28 +22,24 @@
         var map = new google.maps.Map(document.getElementById("map_canvas"),
             myOptions);
  
-				
 		
 	    var contentStringN = '<div id="content">'+
 			        '<div id="siteNotice">'+
 			        '</div>'+	
 			        '<h1 id="firstHeading" class="firstHeading">Lunar Libration</h1>'+
 			        '<div id="bodyContent">'+
-				    '<p> In astronomy, libration is an oscillating motion of orbiting bodies relative to each other, ' +
-				    'notably including the motion of the Moon relative to Earth, or of Trojan asteroids relative to planets.'+
-					'Libration is manifested as a slow rocking back and forth of the Moon as viewed from Earth, permitting an observer'+
-					'to see slightly different halves of the surface at different times.' +
+				    '<p> The Moon generally has one hemisphere facing the Earth, due to tidal locking. ' +
+					'Libration is manifested as a slow rocking back and forth of the Moon as viewed from Earth,'+
+					' permitting an observer to see slightly different halves of the surface at different times. '+ 
 				    '<p>Attribution: Lunar Libration, <a href="http://en.wikipedia.org/wiki/Libration">'+
-				    'http://en.wikipedia.org/wiki/Libration</a></p>'+
-				    '<p><a href="http://sciencenetlinks.com/interactives/moon/moon_challenge/moon_challenge.html">Play this moon challenge</a></p>' +
-				    'This page was last modified on 13 April 2012 at 10:18.'+ 
+				    'http://en.wikipedia.org/wiki/Libration</a>,</p>'+
+				    '<p><a href="http://sciencenetlinks.com/interactives/moon/moon_challenge/moon_challenge.html"> Try out this moon quiz.</a></p>'+
+				    'This page was last modified on 22 April 2012 at 14:48.'+ 
 					'</div>'+
 				    '</div>';		
 				
 				
 		var moonNorth = 'images/LunarLibration.gif';
-		 
-		
 								
 		var infowindowN = new google.maps.InfoWindow({
 			        content: contentStringN
@@ -57,16 +53,13 @@
 	        title: 'Lunar Phases'
 	    });
 
-       
 		
 	
 	    google.maps.event.addListener(markerN, 'click', function() {
 	      infowindowN.open(map,markerN);
 	    });
 	 
-		
-		
-
+	
 
       }
     </script>
diff --git a/express/public/MoonPhases/MoonPhases.html b/express/public/MoonPhases/MoonPhases.html
deleted file mode 100644
index 7908784..0000000
--- a/express/public/MoonPhases/MoonPhases.html
+++ /dev/null
@@ -1,104 +0,0 @@
-<!DOCTYPE html>
-<html>
-  <head>
-    <meta name="viewport" content="initial-scale=1.0, user-scalable=no" />
-    <style type="text/css">
-      html { height: 100% }
-      body { height: 100%; margin: 0; padding: 0 }
-      #map_canvas { height: 100% }
-    </style>
-    <script type="text/javascript"
-      src="http://maps.googleapis.com/maps/api/js?key=AIzaSyDHJLyabbyIQ2C8nzI2xJl4E8KqLu3oUYU&sensor=false">
-    </script>
-    <script type="text/javascript">
-      function initialize() {
-	    var myLatlng = new google.maps.LatLng(0, 0);
-	    var northLatlng = new google.maps.LatLng(89,0);
-		var southLatlng = new google.maps.LatLng(-89,0);
-        var myOptions = {
-          center: myLatlng,
-          zoom: 2,
-          mapTypeId: google.maps.MapTypeId.TERRAIN
-        };
-        var map = new google.maps.Map(document.getElementById("map_canvas"),
-            myOptions);
- 
-        var contentStringS = '<div id="content">'+
-			        '<div id="siteNotice">'+
-			        '</div>'+
-			        '<h1 id="firstHeading" class="firstHeading">Lunar Phases</h1>'+
-			        '<div id="bodyContent">'+
-			        '<p> As the moon orbits the earth, we see the sunlit part of the moon. ' +
-                    'The Moon orbits near the equator of the Earth.' +
-                    'People in different hemispheres see the moon in a slightly different way.'+
-                    'In the Southern Hemisphere, people see the moon upside down so the side which is shining (sunlit) seems the opposite from the Northern Hemisphere.</p>'+
-					'<p>Attribution: Lunar Phases, <a href="http://www.woodlands-junior.kent.sch.uk/time/moon/hemispheres.html">'+
-				    'http://www.woodlands-junior.kent.sch.uk/time/moon/hemispheres.html</a>,</p>'+
-				    'This page was last modified on 13 April 2012 at 10:18.'+ 
-				    '</div>'+
-				    '</div>';
-				
-		
-	    var contentStringN = '<div id="content">'+
-			        '<div id="siteNotice">'+
-			        '</div>'+	
-			        '<h1 id="firstHeading" class="firstHeading">Lunar Phases</h1>'+
-			        '<div id="bodyContent">'+
-				    '<p> As the moon orbits the earth, we see the sunlit part of the moon. ' +
-			        'The Moon orbits near the equator of the Earth.' +
-			        'People in different hemispheres see the moon in a slightly different way.'+
-			        '<a href="http://aa.usno.navy.mil/imagery/moon"> What does the moon like today in the Northern Hemisphere?</a></p>'+
-				    '<p>Attribution: Lunar Phases, <a href="http://www.woodlands-junior.kent.sch.uk/time/moon/hemispheres.html">'+
-				    'http://www.woodlands-junior.kent.sch.uk/time/moon/hemispheres.html</a>,</p>'+
-				    'This page was last modified on 13 April 2012 at 10:18.'+ 
-					'</div>'+
-				    '</div>';		
-				
-				
-		var moonNorth = '../assets/img/moon-phases-northern.gif';
-		 
-		var moonSouth = '../assets/img/moon-phases-southern.gif';
-		
-								
-		var infowindowN = new google.maps.InfoWindow({
-			        content: contentStringN
-	    });
-	
-	   	var infowindowS = new google.maps.InfoWindow({
-			        content: contentStringS
-	    });
-	
-	    var markerN = new google.maps.Marker({
-	        position: northLatlng,
-	        map: map,
-	        icon: moonNorth,
-	        title: 'Lunar Phases'
-	    });
-
-       
-	    var markerS = new google.maps.Marker({
-		        position: southLatlng,
-		        map: map,
-		        icon: moonSouth,
-		        title: 'Lunar Phases'
-		    });
-		
-	
-	    google.maps.event.addListener(markerN, 'click', function() {
-	      infowindowN.open(map,markerN);
-	    });
-	 
-		 google.maps.event.addListener(markerS, 'click', function() {
-		      infowindowS.open(map,markerS);
-		 });			
-		
-
-
-      }
-    </script>
-  </head>
-  <body onload="initialize()">
-    <div id="map_canvas" style="width:100%; height:100%"></div>
-  </body>
-</html>
-  
\ No newline at end of file
diff --git a/MoonPhases/images/LunarLibration.html b/express/public/MoonPhases/images/LunarLibration.html
similarity index 100%
rename from MoonPhases/images/LunarLibration.html
rename to express/public/MoonPhases/images/LunarLibration.html
diff --git a/MoonPhases/images/LunarLibration.gif b/express/public/MoonPhases/images/LunarLibration_files/LunarLibration.gif
similarity index 100%
rename from MoonPhases/images/LunarLibration.gif
rename to express/public/MoonPhases/images/LunarLibration_files/LunarLibration.gif
diff --git a/MoonPhases/images/LunarLibration_files/QuotaService.js b/express/public/MoonPhases/images/LunarLibration_files/QuotaService.js
similarity index 100%
rename from MoonPhases/images/LunarLibration_files/QuotaService.js
rename to express/public/MoonPhases/images/LunarLibration_files/QuotaService.js
diff --git a/MoonPhases/images/LunarLibration_files/ViewportInfoService.js b/express/public/MoonPhases/images/LunarLibration_files/ViewportInfoService.js
similarity index 100%
rename from MoonPhases/images/LunarLibration_files/ViewportInfoService.js
rename to express/public/MoonPhases/images/LunarLibration_files/ViewportInfoService.js
diff --git a/MoonPhases/images/LunarLibration_files/cb_scout_sprite_api_003.png b/express/public/MoonPhases/images/LunarLibration_files/cb_scout_sprite_api_003.png
similarity index 100%
rename from MoonPhases/images/LunarLibration_files/cb_scout_sprite_api_003.png
rename to express/public/MoonPhases/images/LunarLibration_files/cb_scout_sprite_api_003.png
diff --git a/MoonPhases/images/LunarLibration_files/commonmaputilinfowindowmarker.js b/express/public/MoonPhases/images/LunarLibration_files/commonmaputilinfowindowmarker.js
similarity index 100%
rename from MoonPhases/images/LunarLibration_files/commonmaputilinfowindowmarker.js
rename to express/public/MoonPhases/images/LunarLibration_files/commonmaputilinfowindowmarker.js
diff --git a/MoonPhases/images/LunarLibration_files/controlsstats.js b/express/public/MoonPhases/images/LunarLibration_files/controlsstats.js
similarity index 100%
rename from MoonPhases/images/LunarLibration_files/controlsstats.js
rename to express/public/MoonPhases/images/LunarLibration_files/controlsstats.js
diff --git a/MoonPhases/images/LunarLibration_files/ft.js b/express/public/MoonPhases/images/LunarLibration_files/ft.js
similarity index 100%
rename from MoonPhases/images/LunarLibration_files/ft.js
rename to express/public/MoonPhases/images/LunarLibration_files/ft.js
diff --git a/MoonPhases/images/LunarLibration_files/ft_002.js b/express/public/MoonPhases/images/LunarLibration_files/ft_002.js
similarity index 100%
rename from MoonPhases/images/LunarLibration_files/ft_002.js
rename to express/public/MoonPhases/images/LunarLibration_files/ft_002.js
diff --git a/MoonPhases/images/LunarLibration_files/ft_003.js b/express/public/MoonPhases/images/LunarLibration_files/ft_003.js
similarity index 100%
rename from MoonPhases/images/LunarLibration_files/ft_003.js
rename to express/public/MoonPhases/images/LunarLibration_files/ft_003.js
diff --git a/MoonPhases/images/LunarLibration_files/google_white.png b/express/public/MoonPhases/images/LunarLibration_files/google_white.png
similarity index 100%
rename from MoonPhases/images/LunarLibration_files/google_white.png
rename to express/public/MoonPhases/images/LunarLibration_files/google_white.png
diff --git a/MoonPhases/images/LunarLibration_files/imgs8.png b/express/public/MoonPhases/images/LunarLibration_files/imgs8.png
similarity index 100%
rename from MoonPhases/images/LunarLibration_files/imgs8.png
rename to express/public/MoonPhases/images/LunarLibration_files/imgs8.png
diff --git a/MoonPhases/images/LunarLibration_files/iw3.png b/express/public/MoonPhases/images/LunarLibration_files/iw3.png
similarity index 100%
rename from MoonPhases/images/LunarLibration_files/iw3.png
rename to express/public/MoonPhases/images/LunarLibration_files/iw3.png
diff --git a/MoonPhases/images/LunarLibration_files/iws3.png b/express/public/MoonPhases/images/LunarLibration_files/iws3.png
similarity index 100%
rename from MoonPhases/images/LunarLibration_files/iws3.png
rename to express/public/MoonPhases/images/LunarLibration_files/iws3.png
diff --git a/MoonPhases/images/LunarLibration_files/js.js b/express/public/MoonPhases/images/LunarLibration_files/js.js
similarity index 100%
rename from MoonPhases/images/LunarLibration_files/js.js
rename to express/public/MoonPhases/images/LunarLibration_files/js.js
diff --git a/MoonPhases/images/LunarLibration_files/main.js b/express/public/MoonPhases/images/LunarLibration_files/main.js
similarity index 100%
rename from MoonPhases/images/LunarLibration_files/main.js
rename to express/public/MoonPhases/images/LunarLibration_files/main.js
diff --git a/MoonPhases/images/LunarLibration_files/mapcontrols3d7.png b/express/public/MoonPhases/images/LunarLibration_files/mapcontrols3d7.png
similarity index 100%
rename from MoonPhases/images/LunarLibration_files/mapcontrols3d7.png
rename to express/public/MoonPhases/images/LunarLibration_files/mapcontrols3d7.png
diff --git a/MoonPhases/images/LunarLibration_files/onion.js b/express/public/MoonPhases/images/LunarLibration_files/onion.js
similarity index 100%
rename from MoonPhases/images/LunarLibration_files/onion.js
rename to express/public/MoonPhases/images/LunarLibration_files/onion.js
diff --git a/MoonPhases/images/LunarLibration_files/rotate2.png b/express/public/MoonPhases/images/LunarLibration_files/rotate2.png
similarity index 100%
rename from MoonPhases/images/LunarLibration_files/rotate2.png
rename to express/public/MoonPhases/images/LunarLibration_files/rotate2.png
diff --git a/MoonPhases/images/LunarLibration_files/transparent.png b/express/public/MoonPhases/images/LunarLibration_files/transparent.png
similarity index 100%
rename from MoonPhases/images/LunarLibration_files/transparent.png
rename to express/public/MoonPhases/images/LunarLibration_files/transparent.png
diff --git a/MoonPhases/images/LunarLibration_files/vt.jpg b/express/public/MoonPhases/images/LunarLibration_files/vt.jpg
similarity index 100%
rename from MoonPhases/images/LunarLibration_files/vt.jpg
rename to express/public/MoonPhases/images/LunarLibration_files/vt.jpg
diff --git a/MoonPhases/images/LunarLibration_files/vt_002.jpg b/express/public/MoonPhases/images/LunarLibration_files/vt_002.jpg
similarity index 100%
rename from MoonPhases/images/LunarLibration_files/vt_002.jpg
rename to express/public/MoonPhases/images/LunarLibration_files/vt_002.jpg
diff --git a/MoonPhases/images/LunarLibration_files/vt_003.jpg b/express/public/MoonPhases/images/LunarLibration_files/vt_003.jpg
similarity index 100%
rename from MoonPhases/images/LunarLibration_files/vt_003.jpg
rename to express/public/MoonPhases/images/LunarLibration_files/vt_003.jpg
diff --git a/MoonPhases/images/LunarLibration_files/vt_004.jpg b/express/public/MoonPhases/images/LunarLibration_files/vt_004.jpg
similarity index 100%
rename from MoonPhases/images/LunarLibration_files/vt_004.jpg
rename to express/public/MoonPhases/images/LunarLibration_files/vt_004.jpg
diff --git a/MoonPhases/images/LunarLibration_files/vt_005.jpg b/express/public/MoonPhases/images/LunarLibration_files/vt_005.jpg
similarity index 100%
rename from MoonPhases/images/LunarLibration_files/vt_005.jpg
rename to express/public/MoonPhases/images/LunarLibration_files/vt_005.jpg
diff --git a/MoonPhases/images/LunarLibration_files/vt_006.jpg b/express/public/MoonPhases/images/LunarLibration_files/vt_006.jpg
similarity index 100%
rename from MoonPhases/images/LunarLibration_files/vt_006.jpg
rename to express/public/MoonPhases/images/LunarLibration_files/vt_006.jpg
diff --git a/MoonPhases/images/LunarLibration_files/vt_007.jpg b/express/public/MoonPhases/images/LunarLibration_files/vt_007.jpg
similarity index 100%
rename from MoonPhases/images/LunarLibration_files/vt_007.jpg
rename to express/public/MoonPhases/images/LunarLibration_files/vt_007.jpg
diff --git a/MoonPhases/images/LunarLibration_files/vt_008.jpg b/express/public/MoonPhases/images/LunarLibration_files/vt_008.jpg
similarity index 100%
rename from MoonPhases/images/LunarLibration_files/vt_008.jpg
rename to express/public/MoonPhases/images/LunarLibration_files/vt_008.jpg
diff --git a/MoonPhases/images/LunarLibration_files/vt_009.jpg b/express/public/MoonPhases/images/LunarLibration_files/vt_009.jpg
similarity index 100%
rename from MoonPhases/images/LunarLibration_files/vt_009.jpg
rename to express/public/MoonPhases/images/LunarLibration_files/vt_009.jpg
diff --git a/MoonPhases/images/LunarLibration_files/vt_010.jpg b/express/public/MoonPhases/images/LunarLibration_files/vt_010.jpg
similarity index 100%
rename from MoonPhases/images/LunarLibration_files/vt_010.jpg
rename to express/public/MoonPhases/images/LunarLibration_files/vt_010.jpg
diff --git a/MoonPhases/images/LunarLibration_files/vt_011.jpg b/express/public/MoonPhases/images/LunarLibration_files/vt_011.jpg
similarity index 100%
rename from MoonPhases/images/LunarLibration_files/vt_011.jpg
rename to express/public/MoonPhases/images/LunarLibration_files/vt_011.jpg
diff --git a/MoonPhases/images/LunarLibration_files/vt_012.jpg b/express/public/MoonPhases/images/LunarLibration_files/vt_012.jpg
similarity index 100%
rename from MoonPhases/images/LunarLibration_files/vt_012.jpg
rename to express/public/MoonPhases/images/LunarLibration_files/vt_012.jpg
diff --git a/MoonPhases/images/LunarLibration_files/vt_013.jpg b/express/public/MoonPhases/images/LunarLibration_files/vt_013.jpg
similarity index 100%
rename from MoonPhases/images/LunarLibration_files/vt_013.jpg
rename to express/public/MoonPhases/images/LunarLibration_files/vt_013.jpg
diff --git a/MoonPhases/images/LunarLibration_files/vt_014.jpg b/express/public/MoonPhases/images/LunarLibration_files/vt_014.jpg
similarity index 100%
rename from MoonPhases/images/LunarLibration_files/vt_014.jpg
rename to express/public/MoonPhases/images/LunarLibration_files/vt_014.jpg
diff --git a/MoonPhases/images/LunarLibration_files/vt_015.jpg b/express/public/MoonPhases/images/LunarLibration_files/vt_015.jpg
similarity index 100%
rename from MoonPhases/images/LunarLibration_files/vt_015.jpg
rename to express/public/MoonPhases/images/LunarLibration_files/vt_015.jpg
diff --git a/MoonPhases/images/LunarLibration_files/vt_016.jpg b/express/public/MoonPhases/images/LunarLibration_files/vt_016.jpg
similarity index 100%
rename from MoonPhases/images/LunarLibration_files/vt_016.jpg
rename to express/public/MoonPhases/images/LunarLibration_files/vt_016.jpg
diff --git a/express/public/MoonPhases/images/calnorth.gif b/express/public/MoonPhases/images/calnorth.gif
deleted file mode 100644
index 0e22d96..0000000
Binary files a/express/public/MoonPhases/images/calnorth.gif and /dev/null differ
diff --git a/express/public/MoonPhases/images/calsouth.gif b/express/public/MoonPhases/images/calsouth.gif
deleted file mode 100644
index 63a2798..0000000
Binary files a/express/public/MoonPhases/images/calsouth.gif and /dev/null differ
diff --git a/express/public/MoonPhases/images/monnani.gif b/express/public/MoonPhases/images/monnani.gif
deleted file mode 100644
index 19a4e3b..0000000
Binary files a/express/public/MoonPhases/images/monnani.gif and /dev/null differ
diff --git a/express/public/MoonPhases/images/moonani.gif b/express/public/MoonPhases/images/moonani.gif
deleted file mode 100644
index 9fe402d..0000000
Binary files a/express/public/MoonPhases/images/moonani.gif and /dev/null differ
diff --git a/express/public/MoonPhases/images/phases.gif b/express/public/MoonPhases/images/phases.gif
deleted file mode 100644
index 2d247c9..0000000
Binary files a/express/public/MoonPhases/images/phases.gif and /dev/null differ
