From 25d85632120e5341d04cdadd30e3639f5426d3d7 Mon Sep 17 00:00:00 2001
From: Jan Schneider <jan@horde.org>
Date: Tue, 16 Nov 2010 16:02:31 +0100
Subject: [PATCH] Remove redundant 'horde' from map library.

---
 horde/js/{hordemap => map}/OpenLayers-debug.js     |   0
 horde/js/{hordemap => map}/OpenLayers.js           |   0
 horde/js/{hordemap => map}/cloudmade.js            |   0
 horde/js/{hordemap => map}/google.js               |   0
 horde/js/{hordemap => map}/horde.js                |   0
 horde/js/{hordemap => map}/img/blank.gif           | Bin
 .../{hordemap => map}/img/cloud-popup-relative.png | Bin
 .../{hordemap => map}/img/drag-rectangle-off.png   | Bin
 .../js/{hordemap => map}/img/drag-rectangle-on.png | Bin
 horde/js/{hordemap => map}/img/east-mini.png       | Bin
 .../img/layer-switcher-maximize.png                | Bin
 .../img/layer-switcher-minimize.png                | Bin
 .../{hordemap => map}/img/measuring-stick-off.png  | Bin
 .../{hordemap => map}/img/measuring-stick-on.png   | Bin
 horde/js/{hordemap => map}/img/north-mini.png      | Bin
 .../js/{hordemap => map}/img/panning-hand-off.png  | Bin
 horde/js/{hordemap => map}/img/panning-hand-on.png | Bin
 horde/js/{hordemap => map}/img/slider.png          | Bin
 horde/js/{hordemap => map}/img/south-mini.png      | Bin
 horde/js/{hordemap => map}/img/west-mini.png       | Bin
 horde/js/{hordemap => map}/img/zoom-minus-mini.png | Bin
 horde/js/{hordemap => map}/img/zoom-plus-mini.png  | Bin
 horde/js/{hordemap => map}/img/zoom-world-mini.png | Bin
 horde/js/{hordemap => map}/img/zoombar.png         | Bin
 horde/js/{hordemap => map}/lang/ar_SY.js           |   0
 horde/js/{hordemap => map}/lang/bg_BG.js           |   0
 horde/js/{hordemap => map}/lang/ca_ES.js           |   0
 horde/js/{hordemap => map}/lang/cs_CZ.js           |   0
 horde/js/{hordemap => map}/lang/da_DK.js           |   0
 horde/js/{hordemap => map}/lang/de_DE.js           |   0
 horde/js/{hordemap => map}/lang/el_GR.js           |   0
 horde/js/{hordemap => map}/lang/en_CA.js           |   0
 horde/js/{hordemap => map}/lang/es_ES.js           |   0
 horde/js/{hordemap => map}/lang/fi_FI.js           |   0
 horde/js/{hordemap => map}/lang/fr_FR.js           |   0
 horde/js/{hordemap => map}/lang/gl_ES.js           |   0
 horde/js/{hordemap => map}/lang/hu_HU.js           |   0
 horde/js/{hordemap => map}/lang/id_ID.js           |   0
 horde/js/{hordemap => map}/lang/is_IS.js           |   0
 horde/js/{hordemap => map}/lang/it_IT.js           |   0
 horde/js/{hordemap => map}/lang/ja_JP.js           |   0
 horde/js/{hordemap => map}/lang/km_KH.js           |   0
 horde/js/{hordemap => map}/lang/nl_NL.js           |   0
 horde/js/{hordemap => map}/lang/nn_NO.js           |   0
 horde/js/{hordemap => map}/lang/pt_BR.js           |   0
 horde/js/{hordemap => map}/lang/pt_PT.js           |   0
 horde/js/{hordemap => map}/lang/ru_RU.js           |   0
 horde/js/{hordemap => map}/lang/sk_SK.js           |   0
 horde/js/{hordemap => map}/lang/sv_SE.js           |   0
 horde/js/{hordemap => map}/lang/zh_CN.js           |   0
 horde/js/{hordemap => map}/lang/zh_TW.js           |   0
 horde/js/{hordemap => map}/map.js                  |   2 +-
 horde/js/{hordemap => map}/null.js                 |   0
 horde/js/{hordemap => map}/public.js               |   0
 .../theme/default/framedCloud.css                  |   0
 .../js/{hordemap => map}/theme/default/google.css  |   0
 .../{hordemap => map}/theme/default/ie6-style.css  |   0
 .../theme/default/img/add_point_off.png            | Bin
 .../theme/default/img/add_point_on.png             | Bin
 .../{hordemap => map}/theme/default/img/blank.gif  | Bin
 .../{hordemap => map}/theme/default/img/close.gif  | Bin
 .../theme/default/img/drag-rectangle-off.png       | Bin
 .../theme/default/img/drag-rectangle-on.png        | Bin
 .../theme/default/img/draw_line_off.png            | Bin
 .../theme/default/img/draw_line_on.png             | Bin
 .../theme/default/img/draw_point_off.png           | Bin
 .../theme/default/img/draw_point_on.png            | Bin
 .../theme/default/img/draw_polygon_off.png         | Bin
 .../theme/default/img/draw_polygon_on.png          | Bin
 .../theme/default/img/editing_tool_bar.png         | Bin
 .../theme/default/img/move_feature_off.png         | Bin
 .../theme/default/img/move_feature_on.png          | Bin
 .../theme/default/img/navigation_history.png       | Bin
 .../theme/default/img/overview_replacement.gif     | Bin
 .../theme/default/img/pan-panel-NOALPHA.png        | Bin
 .../theme/default/img/pan-panel.png                | Bin
 .../theme/default/img/pan_off.png                  | Bin
 .../{hordemap => map}/theme/default/img/pan_on.png | Bin
 .../theme/default/img/panning-hand-off.png         | Bin
 .../theme/default/img/panning-hand-on.png          | Bin
 .../theme/default/img/remove_point_off.png         | Bin
 .../theme/default/img/remove_point_on.png          | Bin
 .../{hordemap => map}/theme/default/img/ruler.png  | Bin
 .../theme/default/img/save_features_off.png        | Bin
 .../theme/default/img/save_features_on.png         | Bin
 .../theme/default/img/view_next_off.png            | Bin
 .../theme/default/img/view_next_on.png             | Bin
 .../theme/default/img/view_previous_off.png        | Bin
 .../theme/default/img/view_previous_on.png         | Bin
 .../theme/default/img/zoom-panel-NOALPHA.png       | Bin
 .../theme/default/img/zoom-panel.png               | Bin
 horde/js/{hordemap => map}/theme/default/style.css |   0
 horde/js/{hordemap => map}/ve.js                   |   0
 horde/js/{hordemap => map}/yahoo.js                |   0
 horde/package.xml                                  | 202 ++++++++++-----------
 kronolith/lib/Kronolith.php                        |   6 +-
 96 files changed, 105 insertions(+), 105 deletions(-)
 rename horde/js/{hordemap => map}/OpenLayers-debug.js (100%)
 rename horde/js/{hordemap => map}/OpenLayers.js (100%)
 rename horde/js/{hordemap => map}/cloudmade.js (100%)
 rename horde/js/{hordemap => map}/google.js (100%)
 rename horde/js/{hordemap => map}/horde.js (100%)
 rename horde/js/{hordemap => map}/img/blank.gif (100%)
 rename horde/js/{hordemap => map}/img/cloud-popup-relative.png (100%)
 rename horde/js/{hordemap => map}/img/drag-rectangle-off.png (100%)
 rename horde/js/{hordemap => map}/img/drag-rectangle-on.png (100%)
 rename horde/js/{hordemap => map}/img/east-mini.png (100%)
 rename horde/js/{hordemap => map}/img/layer-switcher-maximize.png (100%)
 rename horde/js/{hordemap => map}/img/layer-switcher-minimize.png (100%)
 rename horde/js/{hordemap => map}/img/measuring-stick-off.png (100%)
 rename horde/js/{hordemap => map}/img/measuring-stick-on.png (100%)
 rename horde/js/{hordemap => map}/img/north-mini.png (100%)
 rename horde/js/{hordemap => map}/img/panning-hand-off.png (100%)
 rename horde/js/{hordemap => map}/img/panning-hand-on.png (100%)
 rename horde/js/{hordemap => map}/img/slider.png (100%)
 rename horde/js/{hordemap => map}/img/south-mini.png (100%)
 rename horde/js/{hordemap => map}/img/west-mini.png (100%)
 rename horde/js/{hordemap => map}/img/zoom-minus-mini.png (100%)
 rename horde/js/{hordemap => map}/img/zoom-plus-mini.png (100%)
 rename horde/js/{hordemap => map}/img/zoom-world-mini.png (100%)
 rename horde/js/{hordemap => map}/img/zoombar.png (100%)
 rename horde/js/{hordemap => map}/lang/ar_SY.js (100%)
 rename horde/js/{hordemap => map}/lang/bg_BG.js (100%)
 rename horde/js/{hordemap => map}/lang/ca_ES.js (100%)
 rename horde/js/{hordemap => map}/lang/cs_CZ.js (100%)
 rename horde/js/{hordemap => map}/lang/da_DK.js (100%)
 rename horde/js/{hordemap => map}/lang/de_DE.js (100%)
 rename horde/js/{hordemap => map}/lang/el_GR.js (100%)
 rename horde/js/{hordemap => map}/lang/en_CA.js (100%)
 rename horde/js/{hordemap => map}/lang/es_ES.js (100%)
 rename horde/js/{hordemap => map}/lang/fi_FI.js (100%)
 rename horde/js/{hordemap => map}/lang/fr_FR.js (100%)
 rename horde/js/{hordemap => map}/lang/gl_ES.js (100%)
 rename horde/js/{hordemap => map}/lang/hu_HU.js (100%)
 rename horde/js/{hordemap => map}/lang/id_ID.js (100%)
 rename horde/js/{hordemap => map}/lang/is_IS.js (100%)
 rename horde/js/{hordemap => map}/lang/it_IT.js (100%)
 rename horde/js/{hordemap => map}/lang/ja_JP.js (100%)
 rename horde/js/{hordemap => map}/lang/km_KH.js (100%)
 rename horde/js/{hordemap => map}/lang/nl_NL.js (100%)
 rename horde/js/{hordemap => map}/lang/nn_NO.js (100%)
 rename horde/js/{hordemap => map}/lang/pt_BR.js (100%)
 rename horde/js/{hordemap => map}/lang/pt_PT.js (100%)
 rename horde/js/{hordemap => map}/lang/ru_RU.js (100%)
 rename horde/js/{hordemap => map}/lang/sk_SK.js (100%)
 rename horde/js/{hordemap => map}/lang/sv_SE.js (100%)
 rename horde/js/{hordemap => map}/lang/zh_CN.js (100%)
 rename horde/js/{hordemap => map}/lang/zh_TW.js (100%)
 rename horde/js/{hordemap => map}/map.js (98%)
 rename horde/js/{hordemap => map}/null.js (100%)
 rename horde/js/{hordemap => map}/public.js (100%)
 rename horde/js/{hordemap => map}/theme/default/framedCloud.css (100%)
 rename horde/js/{hordemap => map}/theme/default/google.css (100%)
 rename horde/js/{hordemap => map}/theme/default/ie6-style.css (100%)
 rename horde/js/{hordemap => map}/theme/default/img/add_point_off.png (100%)
 rename horde/js/{hordemap => map}/theme/default/img/add_point_on.png (100%)
 rename horde/js/{hordemap => map}/theme/default/img/blank.gif (100%)
 rename horde/js/{hordemap => map}/theme/default/img/close.gif (100%)
 rename horde/js/{hordemap => map}/theme/default/img/drag-rectangle-off.png (100%)
 rename horde/js/{hordemap => map}/theme/default/img/drag-rectangle-on.png (100%)
 rename horde/js/{hordemap => map}/theme/default/img/draw_line_off.png (100%)
 rename horde/js/{hordemap => map}/theme/default/img/draw_line_on.png (100%)
 rename horde/js/{hordemap => map}/theme/default/img/draw_point_off.png (100%)
 rename horde/js/{hordemap => map}/theme/default/img/draw_point_on.png (100%)
 rename horde/js/{hordemap => map}/theme/default/img/draw_polygon_off.png (100%)
 rename horde/js/{hordemap => map}/theme/default/img/draw_polygon_on.png (100%)
 rename horde/js/{hordemap => map}/theme/default/img/editing_tool_bar.png (100%)
 rename horde/js/{hordemap => map}/theme/default/img/move_feature_off.png (100%)
 rename horde/js/{hordemap => map}/theme/default/img/move_feature_on.png (100%)
 rename horde/js/{hordemap => map}/theme/default/img/navigation_history.png (100%)
 rename horde/js/{hordemap => map}/theme/default/img/overview_replacement.gif (100%)
 rename horde/js/{hordemap => map}/theme/default/img/pan-panel-NOALPHA.png (100%)
 rename horde/js/{hordemap => map}/theme/default/img/pan-panel.png (100%)
 rename horde/js/{hordemap => map}/theme/default/img/pan_off.png (100%)
 rename horde/js/{hordemap => map}/theme/default/img/pan_on.png (100%)
 rename horde/js/{hordemap => map}/theme/default/img/panning-hand-off.png (100%)
 rename horde/js/{hordemap => map}/theme/default/img/panning-hand-on.png (100%)
 rename horde/js/{hordemap => map}/theme/default/img/remove_point_off.png (100%)
 rename horde/js/{hordemap => map}/theme/default/img/remove_point_on.png (100%)
 rename horde/js/{hordemap => map}/theme/default/img/ruler.png (100%)
 rename horde/js/{hordemap => map}/theme/default/img/save_features_off.png (100%)
 rename horde/js/{hordemap => map}/theme/default/img/save_features_on.png (100%)
 rename horde/js/{hordemap => map}/theme/default/img/view_next_off.png (100%)
 rename horde/js/{hordemap => map}/theme/default/img/view_next_on.png (100%)
 rename horde/js/{hordemap => map}/theme/default/img/view_previous_off.png (100%)
 rename horde/js/{hordemap => map}/theme/default/img/view_previous_on.png (100%)
 rename horde/js/{hordemap => map}/theme/default/img/zoom-panel-NOALPHA.png (100%)
 rename horde/js/{hordemap => map}/theme/default/img/zoom-panel.png (100%)
 rename horde/js/{hordemap => map}/theme/default/style.css (100%)
 rename horde/js/{hordemap => map}/ve.js (100%)
 rename horde/js/{hordemap => map}/yahoo.js (100%)

diff --git a/horde/js/hordemap/OpenLayers-debug.js b/horde/js/map/OpenLayers-debug.js
similarity index 100%
rename from horde/js/hordemap/OpenLayers-debug.js
rename to horde/js/map/OpenLayers-debug.js
diff --git a/horde/js/hordemap/OpenLayers.js b/horde/js/map/OpenLayers.js
similarity index 100%
rename from horde/js/hordemap/OpenLayers.js
rename to horde/js/map/OpenLayers.js
diff --git a/horde/js/hordemap/cloudmade.js b/horde/js/map/cloudmade.js
similarity index 100%
rename from horde/js/hordemap/cloudmade.js
rename to horde/js/map/cloudmade.js
diff --git a/horde/js/hordemap/google.js b/horde/js/map/google.js
similarity index 100%
rename from horde/js/hordemap/google.js
rename to horde/js/map/google.js
diff --git a/horde/js/hordemap/horde.js b/horde/js/map/horde.js
similarity index 100%
rename from horde/js/hordemap/horde.js
rename to horde/js/map/horde.js
diff --git a/horde/js/hordemap/img/blank.gif b/horde/js/map/img/blank.gif
similarity index 100%
rename from horde/js/hordemap/img/blank.gif
rename to horde/js/map/img/blank.gif
diff --git a/horde/js/hordemap/img/cloud-popup-relative.png b/horde/js/map/img/cloud-popup-relative.png
similarity index 100%
rename from horde/js/hordemap/img/cloud-popup-relative.png
rename to horde/js/map/img/cloud-popup-relative.png
diff --git a/horde/js/hordemap/img/drag-rectangle-off.png b/horde/js/map/img/drag-rectangle-off.png
similarity index 100%
rename from horde/js/hordemap/img/drag-rectangle-off.png
rename to horde/js/map/img/drag-rectangle-off.png
diff --git a/horde/js/hordemap/img/drag-rectangle-on.png b/horde/js/map/img/drag-rectangle-on.png
similarity index 100%
rename from horde/js/hordemap/img/drag-rectangle-on.png
rename to horde/js/map/img/drag-rectangle-on.png
diff --git a/horde/js/hordemap/img/east-mini.png b/horde/js/map/img/east-mini.png
similarity index 100%
rename from horde/js/hordemap/img/east-mini.png
rename to horde/js/map/img/east-mini.png
diff --git a/horde/js/hordemap/img/layer-switcher-maximize.png b/horde/js/map/img/layer-switcher-maximize.png
similarity index 100%
rename from horde/js/hordemap/img/layer-switcher-maximize.png
rename to horde/js/map/img/layer-switcher-maximize.png
diff --git a/horde/js/hordemap/img/layer-switcher-minimize.png b/horde/js/map/img/layer-switcher-minimize.png
similarity index 100%
rename from horde/js/hordemap/img/layer-switcher-minimize.png
rename to horde/js/map/img/layer-switcher-minimize.png
diff --git a/horde/js/hordemap/img/measuring-stick-off.png b/horde/js/map/img/measuring-stick-off.png
similarity index 100%
rename from horde/js/hordemap/img/measuring-stick-off.png
rename to horde/js/map/img/measuring-stick-off.png
diff --git a/horde/js/hordemap/img/measuring-stick-on.png b/horde/js/map/img/measuring-stick-on.png
similarity index 100%
rename from horde/js/hordemap/img/measuring-stick-on.png
rename to horde/js/map/img/measuring-stick-on.png
diff --git a/horde/js/hordemap/img/north-mini.png b/horde/js/map/img/north-mini.png
similarity index 100%
rename from horde/js/hordemap/img/north-mini.png
rename to horde/js/map/img/north-mini.png
diff --git a/horde/js/hordemap/img/panning-hand-off.png b/horde/js/map/img/panning-hand-off.png
similarity index 100%
rename from horde/js/hordemap/img/panning-hand-off.png
rename to horde/js/map/img/panning-hand-off.png
diff --git a/horde/js/hordemap/img/panning-hand-on.png b/horde/js/map/img/panning-hand-on.png
similarity index 100%
rename from horde/js/hordemap/img/panning-hand-on.png
rename to horde/js/map/img/panning-hand-on.png
diff --git a/horde/js/hordemap/img/slider.png b/horde/js/map/img/slider.png
similarity index 100%
rename from horde/js/hordemap/img/slider.png
rename to horde/js/map/img/slider.png
diff --git a/horde/js/hordemap/img/south-mini.png b/horde/js/map/img/south-mini.png
similarity index 100%
rename from horde/js/hordemap/img/south-mini.png
rename to horde/js/map/img/south-mini.png
diff --git a/horde/js/hordemap/img/west-mini.png b/horde/js/map/img/west-mini.png
similarity index 100%
rename from horde/js/hordemap/img/west-mini.png
rename to horde/js/map/img/west-mini.png
diff --git a/horde/js/hordemap/img/zoom-minus-mini.png b/horde/js/map/img/zoom-minus-mini.png
similarity index 100%
rename from horde/js/hordemap/img/zoom-minus-mini.png
rename to horde/js/map/img/zoom-minus-mini.png
diff --git a/horde/js/hordemap/img/zoom-plus-mini.png b/horde/js/map/img/zoom-plus-mini.png
similarity index 100%
rename from horde/js/hordemap/img/zoom-plus-mini.png
rename to horde/js/map/img/zoom-plus-mini.png
diff --git a/horde/js/hordemap/img/zoom-world-mini.png b/horde/js/map/img/zoom-world-mini.png
similarity index 100%
rename from horde/js/hordemap/img/zoom-world-mini.png
rename to horde/js/map/img/zoom-world-mini.png
diff --git a/horde/js/hordemap/img/zoombar.png b/horde/js/map/img/zoombar.png
similarity index 100%
rename from horde/js/hordemap/img/zoombar.png
rename to horde/js/map/img/zoombar.png
diff --git a/horde/js/hordemap/lang/ar_SY.js b/horde/js/map/lang/ar_SY.js
similarity index 100%
rename from horde/js/hordemap/lang/ar_SY.js
rename to horde/js/map/lang/ar_SY.js
diff --git a/horde/js/hordemap/lang/bg_BG.js b/horde/js/map/lang/bg_BG.js
similarity index 100%
rename from horde/js/hordemap/lang/bg_BG.js
rename to horde/js/map/lang/bg_BG.js
diff --git a/horde/js/hordemap/lang/ca_ES.js b/horde/js/map/lang/ca_ES.js
similarity index 100%
rename from horde/js/hordemap/lang/ca_ES.js
rename to horde/js/map/lang/ca_ES.js
diff --git a/horde/js/hordemap/lang/cs_CZ.js b/horde/js/map/lang/cs_CZ.js
similarity index 100%
rename from horde/js/hordemap/lang/cs_CZ.js
rename to horde/js/map/lang/cs_CZ.js
diff --git a/horde/js/hordemap/lang/da_DK.js b/horde/js/map/lang/da_DK.js
similarity index 100%
rename from horde/js/hordemap/lang/da_DK.js
rename to horde/js/map/lang/da_DK.js
diff --git a/horde/js/hordemap/lang/de_DE.js b/horde/js/map/lang/de_DE.js
similarity index 100%
rename from horde/js/hordemap/lang/de_DE.js
rename to horde/js/map/lang/de_DE.js
diff --git a/horde/js/hordemap/lang/el_GR.js b/horde/js/map/lang/el_GR.js
similarity index 100%
rename from horde/js/hordemap/lang/el_GR.js
rename to horde/js/map/lang/el_GR.js
diff --git a/horde/js/hordemap/lang/en_CA.js b/horde/js/map/lang/en_CA.js
similarity index 100%
rename from horde/js/hordemap/lang/en_CA.js
rename to horde/js/map/lang/en_CA.js
diff --git a/horde/js/hordemap/lang/es_ES.js b/horde/js/map/lang/es_ES.js
similarity index 100%
rename from horde/js/hordemap/lang/es_ES.js
rename to horde/js/map/lang/es_ES.js
diff --git a/horde/js/hordemap/lang/fi_FI.js b/horde/js/map/lang/fi_FI.js
similarity index 100%
rename from horde/js/hordemap/lang/fi_FI.js
rename to horde/js/map/lang/fi_FI.js
diff --git a/horde/js/hordemap/lang/fr_FR.js b/horde/js/map/lang/fr_FR.js
similarity index 100%
rename from horde/js/hordemap/lang/fr_FR.js
rename to horde/js/map/lang/fr_FR.js
diff --git a/horde/js/hordemap/lang/gl_ES.js b/horde/js/map/lang/gl_ES.js
similarity index 100%
rename from horde/js/hordemap/lang/gl_ES.js
rename to horde/js/map/lang/gl_ES.js
diff --git a/horde/js/hordemap/lang/hu_HU.js b/horde/js/map/lang/hu_HU.js
similarity index 100%
rename from horde/js/hordemap/lang/hu_HU.js
rename to horde/js/map/lang/hu_HU.js
diff --git a/horde/js/hordemap/lang/id_ID.js b/horde/js/map/lang/id_ID.js
similarity index 100%
rename from horde/js/hordemap/lang/id_ID.js
rename to horde/js/map/lang/id_ID.js
diff --git a/horde/js/hordemap/lang/is_IS.js b/horde/js/map/lang/is_IS.js
similarity index 100%
rename from horde/js/hordemap/lang/is_IS.js
rename to horde/js/map/lang/is_IS.js
diff --git a/horde/js/hordemap/lang/it_IT.js b/horde/js/map/lang/it_IT.js
similarity index 100%
rename from horde/js/hordemap/lang/it_IT.js
rename to horde/js/map/lang/it_IT.js
diff --git a/horde/js/hordemap/lang/ja_JP.js b/horde/js/map/lang/ja_JP.js
similarity index 100%
rename from horde/js/hordemap/lang/ja_JP.js
rename to horde/js/map/lang/ja_JP.js
diff --git a/horde/js/hordemap/lang/km_KH.js b/horde/js/map/lang/km_KH.js
similarity index 100%
rename from horde/js/hordemap/lang/km_KH.js
rename to horde/js/map/lang/km_KH.js
diff --git a/horde/js/hordemap/lang/nl_NL.js b/horde/js/map/lang/nl_NL.js
similarity index 100%
rename from horde/js/hordemap/lang/nl_NL.js
rename to horde/js/map/lang/nl_NL.js
diff --git a/horde/js/hordemap/lang/nn_NO.js b/horde/js/map/lang/nn_NO.js
similarity index 100%
rename from horde/js/hordemap/lang/nn_NO.js
rename to horde/js/map/lang/nn_NO.js
diff --git a/horde/js/hordemap/lang/pt_BR.js b/horde/js/map/lang/pt_BR.js
similarity index 100%
rename from horde/js/hordemap/lang/pt_BR.js
rename to horde/js/map/lang/pt_BR.js
diff --git a/horde/js/hordemap/lang/pt_PT.js b/horde/js/map/lang/pt_PT.js
similarity index 100%
rename from horde/js/hordemap/lang/pt_PT.js
rename to horde/js/map/lang/pt_PT.js
diff --git a/horde/js/hordemap/lang/ru_RU.js b/horde/js/map/lang/ru_RU.js
similarity index 100%
rename from horde/js/hordemap/lang/ru_RU.js
rename to horde/js/map/lang/ru_RU.js
diff --git a/horde/js/hordemap/lang/sk_SK.js b/horde/js/map/lang/sk_SK.js
similarity index 100%
rename from horde/js/hordemap/lang/sk_SK.js
rename to horde/js/map/lang/sk_SK.js
diff --git a/horde/js/hordemap/lang/sv_SE.js b/horde/js/map/lang/sv_SE.js
similarity index 100%
rename from horde/js/hordemap/lang/sv_SE.js
rename to horde/js/map/lang/sv_SE.js
diff --git a/horde/js/hordemap/lang/zh_CN.js b/horde/js/map/lang/zh_CN.js
similarity index 100%
rename from horde/js/hordemap/lang/zh_CN.js
rename to horde/js/map/lang/zh_CN.js
diff --git a/horde/js/hordemap/lang/zh_TW.js b/horde/js/map/lang/zh_TW.js
similarity index 100%
rename from horde/js/hordemap/lang/zh_TW.js
rename to horde/js/map/lang/zh_TW.js
diff --git a/horde/js/hordemap/map.js b/horde/js/map/map.js
similarity index 98%
rename from horde/js/hordemap/map.js
rename to horde/js/map/map.js
index 2d3ef605f..bef56305a 100644
--- a/horde/js/hordemap/map.js
+++ b/horde/js/map/map.js
@@ -109,7 +109,7 @@ HordeMap = {
      */
     _getScriptLocation: function () {
         var scriptLocation = "";
-        var isMap = new RegExp("(^|(.*?\hordemap\/))(map.js)(\\?|$)");
+        var isMap = new RegExp("(^|(.*?\map\/))(map.js)(\\?|$)");
 
         var scripts = document.getElementsByTagName('script');
         for (var i=0, len=scripts.length; i<len; i++) {
diff --git a/horde/js/hordemap/null.js b/horde/js/map/null.js
similarity index 100%
rename from horde/js/hordemap/null.js
rename to horde/js/map/null.js
diff --git a/horde/js/hordemap/public.js b/horde/js/map/public.js
similarity index 100%
rename from horde/js/hordemap/public.js
rename to horde/js/map/public.js
diff --git a/horde/js/hordemap/theme/default/framedCloud.css b/horde/js/map/theme/default/framedCloud.css
similarity index 100%
rename from horde/js/hordemap/theme/default/framedCloud.css
rename to horde/js/map/theme/default/framedCloud.css
diff --git a/horde/js/hordemap/theme/default/google.css b/horde/js/map/theme/default/google.css
similarity index 100%
rename from horde/js/hordemap/theme/default/google.css
rename to horde/js/map/theme/default/google.css
diff --git a/horde/js/hordemap/theme/default/ie6-style.css b/horde/js/map/theme/default/ie6-style.css
similarity index 100%
rename from horde/js/hordemap/theme/default/ie6-style.css
rename to horde/js/map/theme/default/ie6-style.css
diff --git a/horde/js/hordemap/theme/default/img/add_point_off.png b/horde/js/map/theme/default/img/add_point_off.png
similarity index 100%
rename from horde/js/hordemap/theme/default/img/add_point_off.png
rename to horde/js/map/theme/default/img/add_point_off.png
diff --git a/horde/js/hordemap/theme/default/img/add_point_on.png b/horde/js/map/theme/default/img/add_point_on.png
similarity index 100%
rename from horde/js/hordemap/theme/default/img/add_point_on.png
rename to horde/js/map/theme/default/img/add_point_on.png
diff --git a/horde/js/hordemap/theme/default/img/blank.gif b/horde/js/map/theme/default/img/blank.gif
similarity index 100%
rename from horde/js/hordemap/theme/default/img/blank.gif
rename to horde/js/map/theme/default/img/blank.gif
diff --git a/horde/js/hordemap/theme/default/img/close.gif b/horde/js/map/theme/default/img/close.gif
similarity index 100%
rename from horde/js/hordemap/theme/default/img/close.gif
rename to horde/js/map/theme/default/img/close.gif
diff --git a/horde/js/hordemap/theme/default/img/drag-rectangle-off.png b/horde/js/map/theme/default/img/drag-rectangle-off.png
similarity index 100%
rename from horde/js/hordemap/theme/default/img/drag-rectangle-off.png
rename to horde/js/map/theme/default/img/drag-rectangle-off.png
diff --git a/horde/js/hordemap/theme/default/img/drag-rectangle-on.png b/horde/js/map/theme/default/img/drag-rectangle-on.png
similarity index 100%
rename from horde/js/hordemap/theme/default/img/drag-rectangle-on.png
rename to horde/js/map/theme/default/img/drag-rectangle-on.png
diff --git a/horde/js/hordemap/theme/default/img/draw_line_off.png b/horde/js/map/theme/default/img/draw_line_off.png
similarity index 100%
rename from horde/js/hordemap/theme/default/img/draw_line_off.png
rename to horde/js/map/theme/default/img/draw_line_off.png
diff --git a/horde/js/hordemap/theme/default/img/draw_line_on.png b/horde/js/map/theme/default/img/draw_line_on.png
similarity index 100%
rename from horde/js/hordemap/theme/default/img/draw_line_on.png
rename to horde/js/map/theme/default/img/draw_line_on.png
diff --git a/horde/js/hordemap/theme/default/img/draw_point_off.png b/horde/js/map/theme/default/img/draw_point_off.png
similarity index 100%
rename from horde/js/hordemap/theme/default/img/draw_point_off.png
rename to horde/js/map/theme/default/img/draw_point_off.png
diff --git a/horde/js/hordemap/theme/default/img/draw_point_on.png b/horde/js/map/theme/default/img/draw_point_on.png
similarity index 100%
rename from horde/js/hordemap/theme/default/img/draw_point_on.png
rename to horde/js/map/theme/default/img/draw_point_on.png
diff --git a/horde/js/hordemap/theme/default/img/draw_polygon_off.png b/horde/js/map/theme/default/img/draw_polygon_off.png
similarity index 100%
rename from horde/js/hordemap/theme/default/img/draw_polygon_off.png
rename to horde/js/map/theme/default/img/draw_polygon_off.png
diff --git a/horde/js/hordemap/theme/default/img/draw_polygon_on.png b/horde/js/map/theme/default/img/draw_polygon_on.png
similarity index 100%
rename from horde/js/hordemap/theme/default/img/draw_polygon_on.png
rename to horde/js/map/theme/default/img/draw_polygon_on.png
diff --git a/horde/js/hordemap/theme/default/img/editing_tool_bar.png b/horde/js/map/theme/default/img/editing_tool_bar.png
similarity index 100%
rename from horde/js/hordemap/theme/default/img/editing_tool_bar.png
rename to horde/js/map/theme/default/img/editing_tool_bar.png
diff --git a/horde/js/hordemap/theme/default/img/move_feature_off.png b/horde/js/map/theme/default/img/move_feature_off.png
similarity index 100%
rename from horde/js/hordemap/theme/default/img/move_feature_off.png
rename to horde/js/map/theme/default/img/move_feature_off.png
diff --git a/horde/js/hordemap/theme/default/img/move_feature_on.png b/horde/js/map/theme/default/img/move_feature_on.png
similarity index 100%
rename from horde/js/hordemap/theme/default/img/move_feature_on.png
rename to horde/js/map/theme/default/img/move_feature_on.png
diff --git a/horde/js/hordemap/theme/default/img/navigation_history.png b/horde/js/map/theme/default/img/navigation_history.png
similarity index 100%
rename from horde/js/hordemap/theme/default/img/navigation_history.png
rename to horde/js/map/theme/default/img/navigation_history.png
diff --git a/horde/js/hordemap/theme/default/img/overview_replacement.gif b/horde/js/map/theme/default/img/overview_replacement.gif
similarity index 100%
rename from horde/js/hordemap/theme/default/img/overview_replacement.gif
rename to horde/js/map/theme/default/img/overview_replacement.gif
diff --git a/horde/js/hordemap/theme/default/img/pan-panel-NOALPHA.png b/horde/js/map/theme/default/img/pan-panel-NOALPHA.png
similarity index 100%
rename from horde/js/hordemap/theme/default/img/pan-panel-NOALPHA.png
rename to horde/js/map/theme/default/img/pan-panel-NOALPHA.png
diff --git a/horde/js/hordemap/theme/default/img/pan-panel.png b/horde/js/map/theme/default/img/pan-panel.png
similarity index 100%
rename from horde/js/hordemap/theme/default/img/pan-panel.png
rename to horde/js/map/theme/default/img/pan-panel.png
diff --git a/horde/js/hordemap/theme/default/img/pan_off.png b/horde/js/map/theme/default/img/pan_off.png
similarity index 100%
rename from horde/js/hordemap/theme/default/img/pan_off.png
rename to horde/js/map/theme/default/img/pan_off.png
diff --git a/horde/js/hordemap/theme/default/img/pan_on.png b/horde/js/map/theme/default/img/pan_on.png
similarity index 100%
rename from horde/js/hordemap/theme/default/img/pan_on.png
rename to horde/js/map/theme/default/img/pan_on.png
diff --git a/horde/js/hordemap/theme/default/img/panning-hand-off.png b/horde/js/map/theme/default/img/panning-hand-off.png
similarity index 100%
rename from horde/js/hordemap/theme/default/img/panning-hand-off.png
rename to horde/js/map/theme/default/img/panning-hand-off.png
diff --git a/horde/js/hordemap/theme/default/img/panning-hand-on.png b/horde/js/map/theme/default/img/panning-hand-on.png
similarity index 100%
rename from horde/js/hordemap/theme/default/img/panning-hand-on.png
rename to horde/js/map/theme/default/img/panning-hand-on.png
diff --git a/horde/js/hordemap/theme/default/img/remove_point_off.png b/horde/js/map/theme/default/img/remove_point_off.png
similarity index 100%
rename from horde/js/hordemap/theme/default/img/remove_point_off.png
rename to horde/js/map/theme/default/img/remove_point_off.png
diff --git a/horde/js/hordemap/theme/default/img/remove_point_on.png b/horde/js/map/theme/default/img/remove_point_on.png
similarity index 100%
rename from horde/js/hordemap/theme/default/img/remove_point_on.png
rename to horde/js/map/theme/default/img/remove_point_on.png
diff --git a/horde/js/hordemap/theme/default/img/ruler.png b/horde/js/map/theme/default/img/ruler.png
similarity index 100%
rename from horde/js/hordemap/theme/default/img/ruler.png
rename to horde/js/map/theme/default/img/ruler.png
diff --git a/horde/js/hordemap/theme/default/img/save_features_off.png b/horde/js/map/theme/default/img/save_features_off.png
similarity index 100%
rename from horde/js/hordemap/theme/default/img/save_features_off.png
rename to horde/js/map/theme/default/img/save_features_off.png
diff --git a/horde/js/hordemap/theme/default/img/save_features_on.png b/horde/js/map/theme/default/img/save_features_on.png
similarity index 100%
rename from horde/js/hordemap/theme/default/img/save_features_on.png
rename to horde/js/map/theme/default/img/save_features_on.png
diff --git a/horde/js/hordemap/theme/default/img/view_next_off.png b/horde/js/map/theme/default/img/view_next_off.png
similarity index 100%
rename from horde/js/hordemap/theme/default/img/view_next_off.png
rename to horde/js/map/theme/default/img/view_next_off.png
diff --git a/horde/js/hordemap/theme/default/img/view_next_on.png b/horde/js/map/theme/default/img/view_next_on.png
similarity index 100%
rename from horde/js/hordemap/theme/default/img/view_next_on.png
rename to horde/js/map/theme/default/img/view_next_on.png
diff --git a/horde/js/hordemap/theme/default/img/view_previous_off.png b/horde/js/map/theme/default/img/view_previous_off.png
similarity index 100%
rename from horde/js/hordemap/theme/default/img/view_previous_off.png
rename to horde/js/map/theme/default/img/view_previous_off.png
diff --git a/horde/js/hordemap/theme/default/img/view_previous_on.png b/horde/js/map/theme/default/img/view_previous_on.png
similarity index 100%
rename from horde/js/hordemap/theme/default/img/view_previous_on.png
rename to horde/js/map/theme/default/img/view_previous_on.png
diff --git a/horde/js/hordemap/theme/default/img/zoom-panel-NOALPHA.png b/horde/js/map/theme/default/img/zoom-panel-NOALPHA.png
similarity index 100%
rename from horde/js/hordemap/theme/default/img/zoom-panel-NOALPHA.png
rename to horde/js/map/theme/default/img/zoom-panel-NOALPHA.png
diff --git a/horde/js/hordemap/theme/default/img/zoom-panel.png b/horde/js/map/theme/default/img/zoom-panel.png
similarity index 100%
rename from horde/js/hordemap/theme/default/img/zoom-panel.png
rename to horde/js/map/theme/default/img/zoom-panel.png
diff --git a/horde/js/hordemap/theme/default/style.css b/horde/js/map/theme/default/style.css
similarity index 100%
rename from horde/js/hordemap/theme/default/style.css
rename to horde/js/map/theme/default/style.css
diff --git a/horde/js/hordemap/ve.js b/horde/js/map/ve.js
similarity index 100%
rename from horde/js/hordemap/ve.js
rename to horde/js/map/ve.js
diff --git a/horde/js/hordemap/yahoo.js b/horde/js/map/yahoo.js
similarity index 100%
rename from horde/js/hordemap/yahoo.js
rename to horde/js/map/yahoo.js
diff --git a/horde/package.xml b/horde/package.xml
index 3819bdef5..4134e7562 100644
--- a/horde/package.xml
+++ b/horde/package.xml
@@ -160,7 +160,7 @@ applications.</description>
      <file name="zh-CN.js" role="horde" />
      <file name="zh-TW.js" role="horde" />
     </dir> <!-- /js/date -->
-    <dir name="hordemap">
+    <dir name="map">
      <dir name="img">
       <file name="blank.gif" role="horde" />
       <file name="cloud-popup-relative.png" role="horde" />
@@ -181,7 +181,7 @@ applications.</description>
       <file name="zoom-plus-mini.png" role="horde" />
       <file name="zoom-world-mini.png" role="horde" />
       <file name="zoombar.png" role="horde" />
-     </dir> <!-- /js/hordemap/img -->
+     </dir> <!-- /js/map/img -->
      <dir name="lang">
       <file name="ar_SY.js" role="horde" />
       <file name="bg_BG.js" role="horde" />
@@ -210,7 +210,7 @@ applications.</description>
       <file name="sv_SE.js" role="horde" />
       <file name="zh_CN.js" role="horde" />
       <file name="zh_TW.js" role="horde" />
-     </dir> <!-- /js/hordemap/lang -->
+     </dir> <!-- /js/map/lang -->
      <dir name="theme">
       <dir name="default">
        <dir name="img">
@@ -248,13 +248,13 @@ applications.</description>
         <file name="view_previous_on.png" role="horde" />
         <file name="zoom-panel-NOALPHA.png" role="horde" />
         <file name="zoom-panel.png" role="horde" />
-       </dir> <!-- /js/hordemap/theme/default/img -->
+       </dir> <!-- /js/map/theme/default/img -->
        <file name="framedCloud.css" role="horde" />
        <file name="google.css" role="horde" />
        <file name="ie6-style.css" role="horde" />
        <file name="style.css" role="horde" />
-      </dir> <!-- /js/hordemap/theme/default -->
-     </dir> <!-- /js/hordemap/theme -->
+      </dir> <!-- /js/map/theme/default -->
+     </dir> <!-- /js/map/theme -->
      <file name="cloudmade.js" role="horde" />
      <file name="google.js" role="horde" />
      <file name="horde.js" role="horde" />
@@ -265,7 +265,7 @@ applications.</description>
      <file name="public.js" role="horde" />
      <file name="ve.js" role="horde" />
      <file name="yahoo.js" role="horde" />
-    </dir> <!-- /js/hordemap -->
+    </dir> <!-- /js/map -->
     <dir name="plupload">
      <dir name="i18n">
       <file name="da.js" role="horde" />
@@ -2257,100 +2257,100 @@ applications.</description>
    <install as="js/date/uk-UA.js" name="js/date/uk-UA.js" />
    <install as="js/date/zh-CN.js" name="js/date/zh-CN.js" />
    <install as="js/date/zh-TW.js" name="js/date/zh-TW.js" />
-   <install as="js/hordemap/cloudmade.js" name="js/hordemap/cloudmade.js" />
-   <install as="js/hordemap/google.js" name="js/hordemap/google.js" />
-   <install as="js/hordemap/horde.js" name="js/hordemap/horde.js" />
-   <install as="js/hordemap/map.js" name="js/hordemap/map.js" />
-   <install as="js/hordemap/null.js" name="js/hordemap/null.js" />
-   <install as="js/hordemap/OpenLayers-debug.js" name="js/hordemap/OpenLayers-debug.js" />
-   <install as="js/hordemap/OpenLayers.js" name="js/hordemap/OpenLayers.js" />
-   <install as="js/hordemap/public.js" name="js/hordemap/public.js" />
-   <install as="js/hordemap/ve.js" name="js/hordemap/ve.js" />
-   <install as="js/hordemap/yahoo.js" name="js/hordemap/yahoo.js" />
-   <install as="js/hordemap/img/blank.gif" name="js/hordemap/img/blank.gif" />
-   <install as="js/hordemap/img/cloud-popup-relative.png" name="js/hordemap/img/cloud-popup-relative.png" />
-   <install as="js/hordemap/img/drag-rectangle-off.png" name="js/hordemap/img/drag-rectangle-off.png" />
-   <install as="js/hordemap/img/drag-rectangle-on.png" name="js/hordemap/img/drag-rectangle-on.png" />
-   <install as="js/hordemap/img/east-mini.png" name="js/hordemap/img/east-mini.png" />
-   <install as="js/hordemap/img/layer-switcher-maximize.png" name="js/hordemap/img/layer-switcher-maximize.png" />
-   <install as="js/hordemap/img/layer-switcher-minimize.png" name="js/hordemap/img/layer-switcher-minimize.png" />
-   <install as="js/hordemap/img/measuring-stick-off.png" name="js/hordemap/img/measuring-stick-off.png" />
-   <install as="js/hordemap/img/measuring-stick-on.png" name="js/hordemap/img/measuring-stick-on.png" />
-   <install as="js/hordemap/img/north-mini.png" name="js/hordemap/img/north-mini.png" />
-   <install as="js/hordemap/img/panning-hand-off.png" name="js/hordemap/img/panning-hand-off.png" />
-   <install as="js/hordemap/img/panning-hand-on.png" name="js/hordemap/img/panning-hand-on.png" />
-   <install as="js/hordemap/img/slider.png" name="js/hordemap/img/slider.png" />
-   <install as="js/hordemap/img/south-mini.png" name="js/hordemap/img/south-mini.png" />
-   <install as="js/hordemap/img/west-mini.png" name="js/hordemap/img/west-mini.png" />
-   <install as="js/hordemap/img/zoom-minus-mini.png" name="js/hordemap/img/zoom-minus-mini.png" />
-   <install as="js/hordemap/img/zoom-plus-mini.png" name="js/hordemap/img/zoom-plus-mini.png" />
-   <install as="js/hordemap/img/zoom-world-mini.png" name="js/hordemap/img/zoom-world-mini.png" />
-   <install as="js/hordemap/img/zoombar.png" name="js/hordemap/img/zoombar.png" />
-   <install as="js/hordemap/lang/ar_SY.js" name="js/hordemap/lang/ar_SY.js" />
-   <install as="js/hordemap/lang/bg_BG.js" name="js/hordemap/lang/bg_BG.js" />
-   <install as="js/hordemap/lang/ca_ES.js" name="js/hordemap/lang/ca_ES.js" />
-   <install as="js/hordemap/lang/cs_CZ.js" name="js/hordemap/lang/cs_CZ.js" />
-   <install as="js/hordemap/lang/da_DK.js" name="js/hordemap/lang/da_DK.js" />
-   <install as="js/hordemap/lang/de_DE.js" name="js/hordemap/lang/de_DE.js" />
-   <install as="js/hordemap/lang/el_GR.js" name="js/hordemap/lang/el_GR.js" />
-   <install as="js/hordemap/lang/en_CA.js" name="js/hordemap/lang/en_CA.js" />
-   <install as="js/hordemap/lang/es_ES.js" name="js/hordemap/lang/es_ES.js" />
-   <install as="js/hordemap/lang/fi_FI.js" name="js/hordemap/lang/fi_FI.js" />
-   <install as="js/hordemap/lang/fr_FR.js" name="js/hordemap/lang/fr_FR.js" />
-   <install as="js/hordemap/lang/gl_ES.js" name="js/hordemap/lang/gl_ES.js" />
-   <install as="js/hordemap/lang/hu_HU.js" name="js/hordemap/lang/hu_HU.js" />
-   <install as="js/hordemap/lang/id_ID.js" name="js/hordemap/lang/id_ID.js" />
-   <install as="js/hordemap/lang/is_IS.js" name="js/hordemap/lang/is_IS.js" />
-   <install as="js/hordemap/lang/it_IT.js" name="js/hordemap/lang/it_IT.js" />
-   <install as="js/hordemap/lang/ja_JP.js" name="js/hordemap/lang/ja_JP.js" />
-   <install as="js/hordemap/lang/km_KH.js" name="js/hordemap/lang/km_KH.js" />
-   <install as="js/hordemap/lang/nl_NL.js" name="js/hordemap/lang/nl_NL.js" />
-   <install as="js/hordemap/lang/nn_NO.js" name="js/hordemap/lang/nn_NO.js" />
-   <install as="js/hordemap/lang/pt_BR.js" name="js/hordemap/lang/pt_BR.js" />
-   <install as="js/hordemap/lang/pt_PT.js" name="js/hordemap/lang/pt_PT.js" />
-   <install as="js/hordemap/lang/ru_RU.js" name="js/hordemap/lang/ru_RU.js" />
-   <install as="js/hordemap/lang/sk_SK.js" name="js/hordemap/lang/sk_SK.js" />
-   <install as="js/hordemap/lang/sv_SE.js" name="js/hordemap/lang/sv_SE.js" />
-   <install as="js/hordemap/lang/zh_CN.js" name="js/hordemap/lang/zh_CN.js" />
-   <install as="js/hordemap/lang/zh_TW.js" name="js/hordemap/lang/zh_TW.js" />
-   <install as="js/hordemap/theme/default/framedCloud.css" name="js/hordemap/theme/default/framedCloud.css" />
-   <install as="js/hordemap/theme/default/google.css" name="js/hordemap/theme/default/google.css" />
-   <install as="js/hordemap/theme/default/ie6-style.css" name="js/hordemap/theme/default/ie6-style.css" />
-   <install as="js/hordemap/theme/default/style.css" name="js/hordemap/theme/default/style.css" />
-   <install as="js/hordemap/theme/default/img/add_point_off.png" name="js/hordemap/theme/default/img/add_point_off.png" />
-   <install as="js/hordemap/theme/default/img/add_point_on.png" name="js/hordemap/theme/default/img/add_point_on.png" />
-   <install as="js/hordemap/theme/default/img/blank.gif" name="js/hordemap/theme/default/img/blank.gif" />
-   <install as="js/hordemap/theme/default/img/close.gif" name="js/hordemap/theme/default/img/close.gif" />
-   <install as="js/hordemap/theme/default/img/drag-rectangle-off.png" name="js/hordemap/theme/default/img/drag-rectangle-off.png" />
-   <install as="js/hordemap/theme/default/img/drag-rectangle-on.png" name="js/hordemap/theme/default/img/drag-rectangle-on.png" />
-   <install as="js/hordemap/theme/default/img/draw_line_off.png" name="js/hordemap/theme/default/img/draw_line_off.png" />
-   <install as="js/hordemap/theme/default/img/draw_line_on.png" name="js/hordemap/theme/default/img/draw_line_on.png" />
-   <install as="js/hordemap/theme/default/img/draw_point_off.png" name="js/hordemap/theme/default/img/draw_point_off.png" />
-   <install as="js/hordemap/theme/default/img/draw_point_on.png" name="js/hordemap/theme/default/img/draw_point_on.png" />
-   <install as="js/hordemap/theme/default/img/draw_polygon_off.png" name="js/hordemap/theme/default/img/draw_polygon_off.png" />
-   <install as="js/hordemap/theme/default/img/draw_polygon_on.png" name="js/hordemap/theme/default/img/draw_polygon_on.png" />
-   <install as="js/hordemap/theme/default/img/editing_tool_bar.png" name="js/hordemap/theme/default/img/editing_tool_bar.png" />
-   <install as="js/hordemap/theme/default/img/move_feature_off.png" name="js/hordemap/theme/default/img/move_feature_off.png" />
-   <install as="js/hordemap/theme/default/img/move_feature_on.png" name="js/hordemap/theme/default/img/move_feature_on.png" />
-   <install as="js/hordemap/theme/default/img/navigation_history.png" name="js/hordemap/theme/default/img/navigation_history.png" />
-   <install as="js/hordemap/theme/default/img/overview_replacement.gif" name="js/hordemap/theme/default/img/overview_replacement.gif" />
-   <install as="js/hordemap/theme/default/img/pan-panel-NOALPHA.png" name="js/hordemap/theme/default/img/pan-panel-NOALPHA.png" />
-   <install as="js/hordemap/theme/default/img/pan-panel.png" name="js/hordemap/theme/default/img/pan-panel.png" />
-   <install as="js/hordemap/theme/default/img/panning-hand-off.png" name="js/hordemap/theme/default/img/panning-hand-off.png" />
-   <install as="js/hordemap/theme/default/img/panning-hand-on.png" name="js/hordemap/theme/default/img/panning-hand-on.png" />
-   <install as="js/hordemap/theme/default/img/pan_off.png" name="js/hordemap/theme/default/img/pan_off.png" />
-   <install as="js/hordemap/theme/default/img/pan_on.png" name="js/hordemap/theme/default/img/pan_on.png" />
-   <install as="js/hordemap/theme/default/img/remove_point_off.png" name="js/hordemap/theme/default/img/remove_point_off.png" />
-   <install as="js/hordemap/theme/default/img/remove_point_on.png" name="js/hordemap/theme/default/img/remove_point_on.png" />
-   <install as="js/hordemap/theme/default/img/ruler.png" name="js/hordemap/theme/default/img/ruler.png" />
-   <install as="js/hordemap/theme/default/img/save_features_off.png" name="js/hordemap/theme/default/img/save_features_off.png" />
-   <install as="js/hordemap/theme/default/img/save_features_on.png" name="js/hordemap/theme/default/img/save_features_on.png" />
-   <install as="js/hordemap/theme/default/img/view_next_off.png" name="js/hordemap/theme/default/img/view_next_off.png" />
-   <install as="js/hordemap/theme/default/img/view_next_on.png" name="js/hordemap/theme/default/img/view_next_on.png" />
-   <install as="js/hordemap/theme/default/img/view_previous_off.png" name="js/hordemap/theme/default/img/view_previous_off.png" />
-   <install as="js/hordemap/theme/default/img/view_previous_on.png" name="js/hordemap/theme/default/img/view_previous_on.png" />
-   <install as="js/hordemap/theme/default/img/zoom-panel-NOALPHA.png" name="js/hordemap/theme/default/img/zoom-panel-NOALPHA.png" />
-   <install as="js/hordemap/theme/default/img/zoom-panel.png" name="js/hordemap/theme/default/img/zoom-panel.png" />
+   <install as="js/map/cloudmade.js" name="js/map/cloudmade.js" />
+   <install as="js/map/google.js" name="js/map/google.js" />
+   <install as="js/map/horde.js" name="js/map/horde.js" />
+   <install as="js/map/map.js" name="js/map/map.js" />
+   <install as="js/map/null.js" name="js/map/null.js" />
+   <install as="js/map/OpenLayers-debug.js" name="js/map/OpenLayers-debug.js" />
+   <install as="js/map/OpenLayers.js" name="js/map/OpenLayers.js" />
+   <install as="js/map/public.js" name="js/map/public.js" />
+   <install as="js/map/ve.js" name="js/map/ve.js" />
+   <install as="js/map/yahoo.js" name="js/map/yahoo.js" />
+   <install as="js/map/img/blank.gif" name="js/map/img/blank.gif" />
+   <install as="js/map/img/cloud-popup-relative.png" name="js/map/img/cloud-popup-relative.png" />
+   <install as="js/map/img/drag-rectangle-off.png" name="js/map/img/drag-rectangle-off.png" />
+   <install as="js/map/img/drag-rectangle-on.png" name="js/map/img/drag-rectangle-on.png" />
+   <install as="js/map/img/east-mini.png" name="js/map/img/east-mini.png" />
+   <install as="js/map/img/layer-switcher-maximize.png" name="js/map/img/layer-switcher-maximize.png" />
+   <install as="js/map/img/layer-switcher-minimize.png" name="js/map/img/layer-switcher-minimize.png" />
+   <install as="js/map/img/measuring-stick-off.png" name="js/map/img/measuring-stick-off.png" />
+   <install as="js/map/img/measuring-stick-on.png" name="js/map/img/measuring-stick-on.png" />
+   <install as="js/map/img/north-mini.png" name="js/map/img/north-mini.png" />
+   <install as="js/map/img/panning-hand-off.png" name="js/map/img/panning-hand-off.png" />
+   <install as="js/map/img/panning-hand-on.png" name="js/map/img/panning-hand-on.png" />
+   <install as="js/map/img/slider.png" name="js/map/img/slider.png" />
+   <install as="js/map/img/south-mini.png" name="js/map/img/south-mini.png" />
+   <install as="js/map/img/west-mini.png" name="js/map/img/west-mini.png" />
+   <install as="js/map/img/zoom-minus-mini.png" name="js/map/img/zoom-minus-mini.png" />
+   <install as="js/map/img/zoom-plus-mini.png" name="js/map/img/zoom-plus-mini.png" />
+   <install as="js/map/img/zoom-world-mini.png" name="js/map/img/zoom-world-mini.png" />
+   <install as="js/map/img/zoombar.png" name="js/map/img/zoombar.png" />
+   <install as="js/map/lang/ar_SY.js" name="js/map/lang/ar_SY.js" />
+   <install as="js/map/lang/bg_BG.js" name="js/map/lang/bg_BG.js" />
+   <install as="js/map/lang/ca_ES.js" name="js/map/lang/ca_ES.js" />
+   <install as="js/map/lang/cs_CZ.js" name="js/map/lang/cs_CZ.js" />
+   <install as="js/map/lang/da_DK.js" name="js/map/lang/da_DK.js" />
+   <install as="js/map/lang/de_DE.js" name="js/map/lang/de_DE.js" />
+   <install as="js/map/lang/el_GR.js" name="js/map/lang/el_GR.js" />
+   <install as="js/map/lang/en_CA.js" name="js/map/lang/en_CA.js" />
+   <install as="js/map/lang/es_ES.js" name="js/map/lang/es_ES.js" />
+   <install as="js/map/lang/fi_FI.js" name="js/map/lang/fi_FI.js" />
+   <install as="js/map/lang/fr_FR.js" name="js/map/lang/fr_FR.js" />
+   <install as="js/map/lang/gl_ES.js" name="js/map/lang/gl_ES.js" />
+   <install as="js/map/lang/hu_HU.js" name="js/map/lang/hu_HU.js" />
+   <install as="js/map/lang/id_ID.js" name="js/map/lang/id_ID.js" />
+   <install as="js/map/lang/is_IS.js" name="js/map/lang/is_IS.js" />
+   <install as="js/map/lang/it_IT.js" name="js/map/lang/it_IT.js" />
+   <install as="js/map/lang/ja_JP.js" name="js/map/lang/ja_JP.js" />
+   <install as="js/map/lang/km_KH.js" name="js/map/lang/km_KH.js" />
+   <install as="js/map/lang/nl_NL.js" name="js/map/lang/nl_NL.js" />
+   <install as="js/map/lang/nn_NO.js" name="js/map/lang/nn_NO.js" />
+   <install as="js/map/lang/pt_BR.js" name="js/map/lang/pt_BR.js" />
+   <install as="js/map/lang/pt_PT.js" name="js/map/lang/pt_PT.js" />
+   <install as="js/map/lang/ru_RU.js" name="js/map/lang/ru_RU.js" />
+   <install as="js/map/lang/sk_SK.js" name="js/map/lang/sk_SK.js" />
+   <install as="js/map/lang/sv_SE.js" name="js/map/lang/sv_SE.js" />
+   <install as="js/map/lang/zh_CN.js" name="js/map/lang/zh_CN.js" />
+   <install as="js/map/lang/zh_TW.js" name="js/map/lang/zh_TW.js" />
+   <install as="js/map/theme/default/framedCloud.css" name="js/map/theme/default/framedCloud.css" />
+   <install as="js/map/theme/default/google.css" name="js/map/theme/default/google.css" />
+   <install as="js/map/theme/default/ie6-style.css" name="js/map/theme/default/ie6-style.css" />
+   <install as="js/map/theme/default/style.css" name="js/map/theme/default/style.css" />
+   <install as="js/map/theme/default/img/add_point_off.png" name="js/map/theme/default/img/add_point_off.png" />
+   <install as="js/map/theme/default/img/add_point_on.png" name="js/map/theme/default/img/add_point_on.png" />
+   <install as="js/map/theme/default/img/blank.gif" name="js/map/theme/default/img/blank.gif" />
+   <install as="js/map/theme/default/img/close.gif" name="js/map/theme/default/img/close.gif" />
+   <install as="js/map/theme/default/img/drag-rectangle-off.png" name="js/map/theme/default/img/drag-rectangle-off.png" />
+   <install as="js/map/theme/default/img/drag-rectangle-on.png" name="js/map/theme/default/img/drag-rectangle-on.png" />
+   <install as="js/map/theme/default/img/draw_line_off.png" name="js/map/theme/default/img/draw_line_off.png" />
+   <install as="js/map/theme/default/img/draw_line_on.png" name="js/map/theme/default/img/draw_line_on.png" />
+   <install as="js/map/theme/default/img/draw_point_off.png" name="js/map/theme/default/img/draw_point_off.png" />
+   <install as="js/map/theme/default/img/draw_point_on.png" name="js/map/theme/default/img/draw_point_on.png" />
+   <install as="js/map/theme/default/img/draw_polygon_off.png" name="js/map/theme/default/img/draw_polygon_off.png" />
+   <install as="js/map/theme/default/img/draw_polygon_on.png" name="js/map/theme/default/img/draw_polygon_on.png" />
+   <install as="js/map/theme/default/img/editing_tool_bar.png" name="js/map/theme/default/img/editing_tool_bar.png" />
+   <install as="js/map/theme/default/img/move_feature_off.png" name="js/map/theme/default/img/move_feature_off.png" />
+   <install as="js/map/theme/default/img/move_feature_on.png" name="js/map/theme/default/img/move_feature_on.png" />
+   <install as="js/map/theme/default/img/navigation_history.png" name="js/map/theme/default/img/navigation_history.png" />
+   <install as="js/map/theme/default/img/overview_replacement.gif" name="js/map/theme/default/img/overview_replacement.gif" />
+   <install as="js/map/theme/default/img/pan-panel-NOALPHA.png" name="js/map/theme/default/img/pan-panel-NOALPHA.png" />
+   <install as="js/map/theme/default/img/pan-panel.png" name="js/map/theme/default/img/pan-panel.png" />
+   <install as="js/map/theme/default/img/panning-hand-off.png" name="js/map/theme/default/img/panning-hand-off.png" />
+   <install as="js/map/theme/default/img/panning-hand-on.png" name="js/map/theme/default/img/panning-hand-on.png" />
+   <install as="js/map/theme/default/img/pan_off.png" name="js/map/theme/default/img/pan_off.png" />
+   <install as="js/map/theme/default/img/pan_on.png" name="js/map/theme/default/img/pan_on.png" />
+   <install as="js/map/theme/default/img/remove_point_off.png" name="js/map/theme/default/img/remove_point_off.png" />
+   <install as="js/map/theme/default/img/remove_point_on.png" name="js/map/theme/default/img/remove_point_on.png" />
+   <install as="js/map/theme/default/img/ruler.png" name="js/map/theme/default/img/ruler.png" />
+   <install as="js/map/theme/default/img/save_features_off.png" name="js/map/theme/default/img/save_features_off.png" />
+   <install as="js/map/theme/default/img/save_features_on.png" name="js/map/theme/default/img/save_features_on.png" />
+   <install as="js/map/theme/default/img/view_next_off.png" name="js/map/theme/default/img/view_next_off.png" />
+   <install as="js/map/theme/default/img/view_next_on.png" name="js/map/theme/default/img/view_next_on.png" />
+   <install as="js/map/theme/default/img/view_previous_off.png" name="js/map/theme/default/img/view_previous_off.png" />
+   <install as="js/map/theme/default/img/view_previous_on.png" name="js/map/theme/default/img/view_previous_on.png" />
+   <install as="js/map/theme/default/img/zoom-panel-NOALPHA.png" name="js/map/theme/default/img/zoom-panel-NOALPHA.png" />
+   <install as="js/map/theme/default/img/zoom-panel.png" name="js/map/theme/default/img/zoom-panel.png" />
    <install as="js/plupload/jquery.plupload.queue.js" name="js/plupload/jquery.plupload.queue.js" />
    <install as="js/plupload/plupload.browserplus.js" name="js/plupload/plupload.browserplus.js" />
    <install as="js/plupload/plupload.flash.js" name="js/plupload/plupload.flash.js" />
diff --git a/kronolith/lib/Kronolith.php b/kronolith/lib/Kronolith.php
index 6045d5cef..dc14ef684 100644
--- a/kronolith/lib/Kronolith.php
+++ b/kronolith/lib/Kronolith.php
@@ -1217,7 +1217,7 @@ class Kronolith
             // Language specific file needed?
             //$language = str_replace('_', '-', $GLOBALS['language']);
             $language = $GLOBALS['language'];
-            if (!file_exists($GLOBALS['registry']->get('jsfs', 'horde') . '/hordemap/' . $language . '.js')) {
+            if (!file_exists($GLOBALS['registry']->get('jsfs', 'horde') . '/map/' . $language . '.js')) {
                 $language = 'en-US';
             }
             $params['conf'] = array(
@@ -1255,8 +1255,8 @@ class Kronolith
                 break;
             }
         }
-        $params['jsuri'] = $GLOBALS['registry']->get('jsuri', 'horde') . '/hordemap/';
-        Horde::addScriptFile('hordemap/map.js', 'horde');
+        $params['jsuri'] = $GLOBALS['registry']->get('jsuri', 'horde') . '/map/';
+        Horde::addScriptFile('map/map.js', 'horde');
         $js = 'HordeMap.initialize(' . Horde_Serialize::serialize($params, HORDE_SERIALIZE::JSON) . ');';
         Horde::addinlineScript($js);
     }
-- 
2.11.0