diff --git a/mapping.js b/mapping.js
index edfc65a..dc4e2c0 100644
--- a/mapping.js
+++ b/mapping.js
@@ -5,13 +5,6 @@
  */
 
 /**
- * Namespace for mapping objects.
- */
-Drupal.mapping = Drupal.mapping || {};
-Drupal.mapping.layerHandlers = Drupal.mapping.layerHandlers || {};
-Drupal.mapping.mapHandlers = Drupal.mapping.mapHandlers || {};
-
-/**
  * Namespacing for jQuery
  */
 (function($) {
@@ -119,4 +112,10 @@ Drupal.mapping = {
       }
     }
   }
-};
\ No newline at end of file
+};
+
+/**
+ * Namespace for mapping objects. Placed here so mapping object above doesn't overwrite.
+ */
+Drupal.mapping.layerHandlers = Drupal.mapping.layerHandlers || {};
+Drupal.mapping.mapHandlers = Drupal.mapping.mapHandlers || {};
diff --git a/mapping_example/plugins/mapping_map_types/mapping_example_google_map_type.js b/mapping_example/plugins/mapping_map_types/mapping_example_google_map_type.js
index c692a72..cd11762 100644
--- a/mapping_example/plugins/mapping_map_types/mapping_example_google_map_type.js
+++ b/mapping_example/plugins/mapping_map_types/mapping_example_google_map_type.js
@@ -3,10 +3,6 @@
  * Mapping Example Google Map Type
  */
 
-// Needs to be namespaced a bit even though this 
-//should not be necessary.
-Drupal.mapping.mapHandlers = Drupal.mapping.mapHandlers || {};
-
 /**
  * Process Google Layers for Mapping Example module
  *
@@ -26,4 +22,4 @@ Drupal.mapping.mapHandlers.mapping_example_google_map_type = function(mapData) {
   var map = new google.maps.Map(document.getElementById(mapData.id), mapOptions);
   
   return map;
-};
\ No newline at end of file
+};